| manifest.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/home/components/home-top-flow.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/login.scss | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/supplier-login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/supplier-reg.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/shop/shop.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/trade/detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/trade/list.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
manifest.json
@@ -49,7 +49,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { "appid" : "wx3203fd935a6ffe09", "appid" : "wx1441324401626290", "setting" : { "urlCheck" : false, "es6" : true, pages/home/components/home-top-flow.vue
@@ -125,15 +125,15 @@ display: flex; .tag { min-width: 60rpx; // min-width: 60rpx; padding-left: 10rpx; padding-right: 10rpx; line-height: 30rpx; background: #FEE6E6; border-radius: 10rpx; font-size: 22rpx; font-size: 18rpx; color: #CD1212; margin-right: 12rpx; margin-right: 6rpx; text-align: center; }
@@ -46,7 +46,7 @@ background: var(--topicolor); border-radius: 46rpx; text-align: center; margin-top: 120rpx; margin-top: 40rpx; margin-bottom: 42rpx; } pages/login/supplier-login.vue
@@ -46,6 +46,43 @@ </view> <view class="flex flex-wrap-normal" v-if="true"> <view :style="{'margin-top': '40rpx','margin-right': '12rpx','font-size':'24rpx'}" @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']"> </view> <!-- /pages/help/content?id=新手帮助 --> <!-- 用户协议，隐私政策、卖家入驻协议、合伙人入驻协议 --> <!-- #ifdef PUB_PARTNER --> <view class="topic-gray"> 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、 <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span> 、<span class="t-red" @click="goto('/pages/help/content?id=合伙人入驻协议',false)">《合伙人入驻协议》</span> 如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> <!-- #ifdef PUB_SUPPLIER --> <view class="topic-gray"> 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、 <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span> 、<span class="t-red" @click="goto('/pages/help/content?id=卖家入驻协议',false)">《卖家入驻协议》</span> 如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> <!-- #ifdef PUB_CUSTOMER --> <view class="topic-gray"> 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>和 <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span> 如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> </view> <button @tap="login()" class="bottom-button">登 录</button> @@ -308,7 +345,8 @@ }, onShareAppMessage() { let that = this; var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || '' var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO && that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || '' var url = `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 return { @@ -318,7 +356,8 @@ }, onShareTimeline() { let that = this; var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || '' var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO && that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || '' var url = `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 return { @@ -346,7 +385,8 @@ getCodeText: '获取验证码', getCodeBtnColor: "#20613D", getCodeisWaiting: false, Timer: undefined, Timer: undefined, protocal:false, // #ifdef PUB_SUPPLIER apitype: 'loginSupplier', // #endif @@ -459,7 +499,11 @@ changeAll(e) { this.pcfvalue = e.detail.value[0] }, async login() { async login() { if(!this.protocal){ this.$message.showToast('请同意用户协议') return } uni.showLoading({ title: '登陆中' }); @@ -525,7 +569,7 @@ // uni.navigateBack(); // }, 1000); } else { // uni.showToast({ pages/login/supplier-reg.vue
@@ -1,21 +1,20 @@ <template> <view> <view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;;background-color: #e6e6e6;"> <!-- #ifdef PUB_PARTNER --> <view style="padding: 20rpx;text-align: center;background-color: #fff;">仅限花满芫合伙人入驻</view> <!-- #endif -->e <view v-if="source==='step'" class="" style="background-color:#ffffff;padding: 20rpx;padding-top: 60rpx;"> <u-steps current="1"> <u-steps-item title="信息填写" class="u-steps-item"> </u-steps-item> <u-steps-item title="提交申请" class="u-steps-item"></u-steps-item> </u-steps> </view> </view> <view class="main-container login-container img100 relative" style="margin-top: 0rpx;"> <view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;;background-color: #e6e6e6;"> <!-- #ifdef PUB_PARTNER --> <view style="padding: 20rpx;text-align: center;background-color: #fff;padding-top: 60rpx;">仅限花满芫合伙人入驻</view> <!-- #endif --> <view v-if="source==='step'" class="" style="background-color:#ffffff;padding: 20rpx;padding-top: 60rpx;"> <u-steps current="1"> <u-steps-item title="信息填写" class="u-steps-item"> </u-steps-item> <u-steps-item title="提交申请" class="u-steps-item"></u-steps-item> </u-steps> </view> </view> <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a5/a54508de179a4942918ecb2c5a4aa9f5bg.png" mode="scaleToFill" /> @@ -63,6 +62,45 @@ <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input> </view> <view class="flex flex-wrap-normal" v-if="true"> <view :style="{'margin-top': '40rpx','margin-right': '12rpx','font-size':'24rpx'}" @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']"> </view> <!-- /pages/help/content?id=新手帮助 --> <!-- 用户协议，隐私政策、卖家入驻协议、合伙人入驻协议 --> <!-- #ifdef PUB_PARTNER --> <view class="topic-gray"> 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、 <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span> 、<span class="t-red" @click="goto('/pages/help/content?id=合伙人入驻协议',false)">《合伙人入驻协议》</span> 如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> <!-- #ifdef PUB_SUPPLIER --> <view class="topic-gray"> 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、 <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span> 、<span class="t-red" @click="goto('/pages/help/content?id=卖家入驻协议',false)">《卖家入驻协议》</span> 如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> <!-- #ifdef PUB_CUSTOMER --> <view class="topic-gray"> 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>和 <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span> 如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> </view> <!-- #ifndef PUB_CUSTOMER --> <button @tap="reg('')" class="bottom-button">注 册</button> @@ -83,36 +121,6 @@ </view> --> <!-- #endif --> <view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view> </view> <view class="flex flex-wrap-normal" style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="true"> <view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}" @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']"> </view> <!-- /pages/help/content?id=新手帮助 --> <!-- 用户协议，隐私政策、卖家入驻协议、合伙人入驻协议 --> <!-- #ifdef PUB_PARTNER --> <view class="topic-gray" @click="goto('/pages/help/content?id=合伙人入驻协议',false)"> 请仔细阅读《合伙人入驻协议》如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> <!-- #ifdef PUB_SUPPLIER --> <view class="topic-gray" @click="goto('/pages/help/content?id=卖家入驻协议',false)"> 请仔细阅读《卖家入驻协议》如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> <!-- #ifdef PUB_CUSTOMER --> <view class="topic-gray"> 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>和 <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span> 如您同意该指引，请勾选开始使用本小程序 </view> <!-- #endif --> </view> </form> </view> sub_pages/customer/shop/shop.vue
@@ -573,15 +573,15 @@ display: flex; .tag { min-width: 60rpx; padding-left: 10rpx; padding-right: 10rpx; line-height: 30rpx; background: #FEE6E6; border-radius: 10rpx; font-size: 22rpx; color: #CD1212; margin-right: 12rpx; // min-width: 60rpx; padding-left: 10rpx; padding-right: 10rpx; line-height: 30rpx; background: #FEE6E6; border-radius: 10rpx; font-size: 18rpx; color: #CD1212; margin-right: 6rpx; text-align: center; }
@@ -591,15 +591,15 @@ display: flex; .tag { min-width: 60rpx; // min-width: 60rpx; padding-left: 10rpx; padding-right: 10rpx; line-height: 30rpx; background: #FEE6E6; border-radius: 10rpx; font-size: 22rpx; font-size: 18rpx; color: #CD1212; margin-right: 12rpx; margin-right: 6rpx; text-align: center; }
@@ -526,15 +526,15 @@ display: flex; .tag { min-width: 60rpx; // min-width: 60rpx; padding-left: 10rpx; padding-right: 10rpx; line-height: 30rpx; background: #FEE6E6; border-radius: 10rpx; font-size: 22rpx; font-size: 18rpx; color: #CD1212; margin-right: 12rpx; margin-right: 6rpx; text-align: center; }
