Compare commits

..

No commits in common. 'fcee418cad2e85c1b22fc9ee36e667dcfbc11357' and '27ec1f391ba358c8dbacb751a8d3bc94e1b94aed' have entirely different histories.

@ -1,5 +1,2 @@
# SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz
SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080
# 线上地址
# SHOPRO_DEV_BASE_URL = https://zda.huamar.com
SHOPRO_DEV_BASE_URL = http://192.168.1.118:48080

@ -1,2 +1,2 @@
SHOPRO_DEV_BASE_URL = https://zda.huamar.com
SHOPRO_DEV_BASE_URL = https://123456789.shopro.cn

@ -15,7 +15,7 @@
## 🐯 商城简介
**郑大钒水**,基于 [郑大钒水平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建,以开发者为中心,打造中国第一流的 Java 开源商城系统,全部开源,个人与企业可 100% 免费使用。
**芋道商城**,基于 [芋道开发平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建,以开发者为中心,打造中国第一流的 Java 开源商城系统,全部开源,个人与企业可 100% 免费使用。
> 有任何问题,或者想要的功能,可以在 Issues 中提给艿艿。
>

@ -184,7 +184,7 @@
"versionCode": 100
},
"mp-weixin": {
"appid": "wx879300e525dc9847",
"appid": "wx53b5ac263b9cdb5b",
"setting": {
"urlCheck": false,
"minified": true,

@ -1,9 +1,9 @@
{
"id": "shopro",
"name": "shopro",
"displayName": "郑大钒水",
"displayName": "芋道商城",
"version": "2.1.0",
"description": "郑大钒水一套代码同时发行到iOS、Android、H5、微信小程序多个平台请使用手机扫码快速体验强大功能",
"description": "芋道商城一套代码同时发行到iOS、Android、H5、微信小程序多个平台请使用手机扫码快速体验强大功能",
"scripts": {
"prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
},

@ -2,7 +2,7 @@
<template>
<view>
<!-- 标题栏 -->
<!-- <view class="head-box ss-m-b-60">
<view class="head-box ss-m-b-60">
<view class="ss-flex ss-m-b-20">
<view class="head-title head-title-line head-title-animation">短信登录</view>
<view class="head-title-active ss-m-r-40" @tap="showAuthModal('accountLogin')">
@ -10,10 +10,10 @@
</view>
</view>
<view class="head-subtitle">未注册的手机号验证后自动注册账号</view>
</view> -->
</view>
<!-- 表单项 -->
<!-- <uni-forms
<uni-forms
ref="smsLoginRef"
v-model="state.model"
:rules="state.rules"
@ -54,7 +54,7 @@
</template>
</uni-easyinput>
</uni-forms-item>
</uni-forms> -->
</uni-forms>
</view>
</template>

@ -104,7 +104,7 @@
width: 100%;
.auto-login-btn {
width: 68rpx;
height: 168rpx;
height: 68rpx;
border-radius: 50%;
margin: 0 30rpx;
}

@ -31,7 +31,7 @@
>
<!-- 7.1 微信小程序的快捷登录 -->
<view v-if="sheep.$platform.name === 'WechatMiniProgram'" class="ss-flex register-box">
<!-- <view class="register-title">还没有账号?</view> -->
<view class="register-title">还没有账号?</view>
<button class="ss-reset-button login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
快捷登录
</button>

@ -36,14 +36,14 @@
</button>
<!-- 操作 生成链接 -->
<!-- <button
<button
v-if="shareConfig.methods.includes('link')"
class="share-item share-btn ss-flex-col ss-col-center"
@tap="onShareByCopyLink"
>
<image class="share-img" :src="sheep.$url.static('/static/img/shop/share/share_link.png')" mode="" />
<text class="share-title">复制链接</text>
</button> -->
</button>
</view>
<view class="share-foot ss-flex ss-row-center ss-col-center" @tap="closeShareModal">
取消

Loading…
Cancel
Save