diff --git a/components/blindBox/blindBox.vue b/components/blindBox/blindBox.vue index 84f9440..84c2584 100644 --- a/components/blindBox/blindBox.vue +++ b/components/blindBox/blindBox.vue @@ -9,7 +9,7 @@ - + @@ -28,7 +28,7 @@ - + 很遗憾,差一点就中奖了 期待您下次再来 我知道了 @@ -219,7 +219,7 @@ .rule { width: 80rpx; height: 120rpx; - background-image: url(@/static/images/right-btn.png); + background-image: url('https://store.tropjoin.com/images/right-btn.png'); background-size: 100%; background-repeat: no-repeat; position: absolute; @@ -259,7 +259,7 @@ margin: 20rpx 0; line-height: 54rpx; text-align: center; - background: url('@/static/images/mh-title.png') no-repeat; + background: url('https://store.tropjoin.com/images/mh-title.png') no-repeat; background-size: 100% 100%; background-position: center; } @@ -267,7 +267,7 @@ width: 100%; height: 480rpx; // background: #D753FC; - background-image: url('@/static/images/mh-bg.png'); + background-image: url('https://store.tropjoin.com/images/mh-bg.png'); background-repeat: no-repeat; background-size: 100%; display: flex; @@ -280,7 +280,7 @@ height: auto; } .action{ - background: url('@/static/images/mh-item-bg.png'); + background: url('https://store.tropjoin.com/images/mh-item-bg.png'); background-repeat: no-repeat; background-size: 100% 100%; animation:bounce .8s 1; diff --git a/components/emptyPage.vue b/components/emptyPage.vue index 31a76da..7c7f5a5 100644 --- a/components/emptyPage.vue +++ b/components/emptyPage.vue @@ -1,6 +1,6 @@ diff --git a/components/treasureBox/index.vue b/components/treasureBox/index.vue index 7f0274a..8154b43 100644 --- a/components/treasureBox/index.vue +++ b/components/treasureBox/index.vue @@ -6,9 +6,9 @@ - - - + + + 立刻开启 @@ -28,7 +28,7 @@ - + 很遗憾,差一点就中奖了 期待您下次再来 我知道了 @@ -195,7 +195,7 @@ .rule { width: 80rpx; height: 120rpx; - background-image: url(@/static/images/right-btn.png); + background-image: url('https://store.tropjoin.com/images/right-btn.png'); background-size: 100%; background-repeat: no-repeat; position: absolute; @@ -218,7 +218,7 @@ .top{ width: 488rpx; height: 140rpx; - background-image: url('@/static/images/box-title.png'); + background-image: url('https://store.tropjoin.com/images/box-title.png'); background-size: 100% 100%; margin: 0 auto; } @@ -244,7 +244,7 @@ margin: 20rpx 0; line-height: 54rpx; text-align: center; - background: url('@/static/images/font-bg.png') no-repeat 100%; + background: url('https://store.tropjoin.com/images/font-bg.png') no-repeat 100%; background-position: center; } } diff --git a/config/app.js b/config/app.js index 5dc8628..afa9a68 100644 --- a/config/app.js +++ b/config/app.js @@ -7,11 +7,11 @@ let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://many.shop.lo' //测试 -let httpApi = 'https://plus.hwms.shop' //生产 +let httpApi = 'https://api.tropjoin.com' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如:wss://mer. .net // let wsApi = 'ws://192.168.3.20:8324' -let wsApi = 'wss://plus.hwms.shop' +let wsApi = 'wss://ws.tropjoin.com' module.exports = { // 请求域名 格式: https://您的域名 diff --git a/pages/news_list/index.vue b/pages/news_list/index.vue index 3a759e1..fea0f8d 100644 --- a/pages/news_list/index.vue +++ b/pages/news_list/index.vue @@ -39,7 +39,7 @@ - + 暂无新闻信息~ diff --git a/pages/store/merchantDetails/index.vue b/pages/store/merchantDetails/index.vue index f29c56a..1c3367d 100644 --- a/pages/store/merchantDetails/index.vue +++ b/pages/store/merchantDetails/index.vue @@ -21,7 +21,7 @@ - 温馨提示:初始密码默认为手机号后六位,请初次登录后及时修改 + 温馨提示:初始密码默认为对接人手机号后六位,请初次登录后及时修改 diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 235f4ee..31bc6b6 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -138,13 +138,13 @@ - 企业对接人编号 + 企业对接人身份证号码 - 请填写铸源优品ID号 + 请填写企业对接人身份证号码 @@ -166,14 +166,13 @@ 请填写11位手机号码 - + 请填写铸源优品ID号 @@ -228,7 +227,7 @@ - + --> @@ -253,13 +252,13 @@ - + - + @@ -431,7 +430,7 @@ } }, onShow() { - + console.log(1111); }, computed: { ...mapGetters(['isLogin', 'viewColor']), @@ -491,10 +490,11 @@ shopName,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType } = this.shopInfo; - if (shopName&&businessAddress&&businessAddressDetail&&EnterpriseType&&EnterpriseName&&EnterpriseJoinName&&EnterprisePhone&&EnterpriseId&&userName&&userPhone&&userId&&userPhoto&&mer_type&&mer_storeType ) { - if(isVeteran&&isVeteranPhoto.length==0){ - this.validate=false; - }else if (isFlagshipStore&&isFlagshipStorePhoto.length==0){ + if (shopName&&businessAddress&&businessAddressDetail&&EnterpriseType&&EnterpriseName&&EnterpriseJoinName&&EnterprisePhone&&EnterpriseId&&mer_type&&mer_storeType ) { + // if(isVeteran&&isVeteranPhoto.length==0){ + // this.validate=false; + // }else + if (isFlagshipStore&&isFlagshipStorePhoto.length==0){ this.validate=false; }else{ let date2 = { @@ -579,26 +579,27 @@ nextStep() { let a=this.checkPhone(this.shopInfo.userPhone); let b=this.checkPhone(this.shopInfo.EnterprisePhone); - if(!a){ - uni.showToast({ - icon:'none', - title: '发起人手机号格式有误' - }); - return - } + // if(!a){ + // uni.showToast({ + // icon:'none', + // title: '发起人手机号格式有误' + // }); + // return + // } if(!b){ uni.showToast({ icon:'none', title: '企业对接人手机号格式有误' }); return - }else if(this.shopInfo.userPhoto.length!=1){ - uni.showToast({ - icon:'none', - title: '请上传手持介绍信' - }); - return } + // }else if(this.shopInfo.userPhoto.length!=1){ + // uni.showToast({ + // icon:'none', + // title: '请上传手持介绍信' + // }); + // return + // } if(this.mer_i_id){ uni.navigateTo({ url: '/pages/store/settled/step2?mer_i_id='+this.mer_i_id @@ -659,27 +660,27 @@ }); } }, - downTemplate() { + // downTemplate() { - uni.showModal({ - title: '是否下载示例模版', - success(res) { - if (res.confirm) { - location.href = 'https://plus.hwms.shop/uploads/file/letter_introduction.docx' - } else if (res.cancel) { - return - } - } - }) + // uni.showModal({ + // title: '是否下载示例模版', + // success(res) { + // if (res.confirm) { + // location.href = 'https://plus.hwms.shop/uploads/file/letter_introduction.docx' + // } else if (res.cancel) { + // return + // } + // } + // }) - }, - perviewTemplate() { - let url = ['https://plus.hwms.shop/uploads/file/mer_template.jpg']; - uni.previewImage({ - current: url[0], // 传 Number H5端出现不兼容 - urls: url - }); - }, + // }, + // perviewTemplate() { + // let url = ['https://plus.hwms.shop/uploads/file/mer_template.jpg']; + // uni.previewImage({ + // current: url[0], // 传 Number H5端出现不兼容 + // urls: url + // }); + // }, jumpToList() { uni.navigateTo({ url: "/pages/store/applicationRecord/index" diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue index 98b68c1..2ec56ed 100644 --- a/pages/store/settled/step2.vue +++ b/pages/store/settled/step2.vue @@ -29,13 +29,16 @@ - 身份证正、反面清晰照片 + 身份证正、反面及法人手持身份证清晰照片 {{shopInfo.idCardPhoto.length}}/3 - + + + 提示:请按照提示顺序上传照片 @@ -85,8 +88,8 @@ - - {{shopInfo.idCardStartTime}} + + {{shopInfo.idCardStartTime?shopInfo.idCardStartTime:'请选择开始日期'}} @@ -95,9 +98,9 @@ 请检查格式是否为:x年x月x日 - + @@ -107,8 +110,11 @@ 法人身份证有效期结束 - + + + {{shopInfo.idCardEndTime?shopInfo.idCardEndTime:'请选择结束日期'}} @@ -133,9 +139,9 @@ {{shopInfo.businessLicense.length}}/1 - + @@ -160,24 +166,35 @@ 统一社会信用证开始日期 - + + + + {{shopInfo.countStartTime?shopInfo.countStartTime:'请选择开始日期'}} + + 请检查格式是否为:x年x月x日 - + 统一社会信用证截止日期 - + + + + {{shopInfo.countEndTime?shopInfo.countEndTime:'请选择截止日期'}} + + + @@ -193,12 +210,12 @@ - + @@ -295,11 +312,13 @@ }else if(newVal.length==2){ this.verifyIDcard(1) } + this.validateBtn() } }, 'shopInfo.businessLicense':{ handler:function(newVal, oldVal){ this.verifyBusinessLicense(); + this.validateBtn() } } }, @@ -351,7 +370,7 @@ let data2=uni.getStorageSync('updateShopInfo'); let idcard=data2.idcard; let biz=data2.biz; - idCardPhoto=[idcard.image1,idcard.image2],idCardName=idcard.name,idCardNumber=idcard.number,idCardStartTime=idcard.start,idCardEndTime=idcard.end,businessLicense=biz.image,countId=biz.number,countStartTime=biz.start,countEndTime=biz.end,registerAddressDetail=biz.address,businessScope=biz.businessScope + idCardPhoto=[idcard.image1,idcard.image2,idcard.image3],idCardName=idcard.name,idCardNumber=idcard.number,idCardStartTime=idcard.start,idCardEndTime=idcard.end,businessLicense=biz.image,countId=biz.number,countStartTime=biz.start,countEndTime=biz.end,registerAddressDetail=biz.address,businessScope=biz.businessScope this.shopInfo={idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}; uni.hideLoading(); this.validateBtn(); @@ -413,7 +432,7 @@ console.log(this.shopInfo) let data2=uni.getStorageSync('shopInfo'); let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo; - if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&businessScope&®isterAddressDetail){ + if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&®isterAddressDetail){ let idcard={ image1:idCardPhoto[0], image2:idCardPhoto[1], @@ -505,6 +524,7 @@ */ uploadpic: function(item) { let that = this; + console.log(item); that.$util.uploadImageOne('upload/image', function(res) { item.push(res.data.path); }); @@ -574,6 +594,7 @@ } .item-name{ width: 340rpx; + min-height: 72rpx; } .uni-list-cell { position: relative; diff --git a/pages/store/settled/step3.vue b/pages/store/settled/step3.vue index fed3622..09bc1e9 100644 --- a/pages/store/settled/step3.vue +++ b/pages/store/settled/step3.vue @@ -95,7 +95,7 @@ - 提示:请核验信息是否正确 + 提示:请填写完整的支行名称(如:中国农业银行天津迎宾支行) @@ -216,6 +216,7 @@ 'shopInfo.bankCardImg':{ handler:function(newVal, oldVal){ this.verifyBankCard() + this.validateBtn() } }, 'shopInfo.bankBranchName':{ diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue index 2cca59c..a0a2658 100644 --- a/pages/users/login/index.vue +++ b/pages/users/login/index.vue @@ -53,7 +53,8 @@
- 我已同意《用户协议》《隐私政策》 + 我已同意《隐私政策》 +
diff --git a/pages/users/real_name_authentication/index.vue b/pages/users/real_name_authentication/index.vue index 84867b9..2592825 100644 --- a/pages/users/real_name_authentication/index.vue +++ b/pages/users/real_name_authentication/index.vue @@ -19,7 +19,7 @@ - + 拍摄正面 @@ -27,7 +27,7 @@ - + 拍摄反面 @@ -40,7 +40,7 @@ - + 拍摄标准 @@ -48,7 +48,7 @@ 边框缺失 - + 照片模糊 diff --git a/pages/users/user_luckyDraw/index.vue b/pages/users/user_luckyDraw/index.vue index 575934d..674658b 100644 --- a/pages/users/user_luckyDraw/index.vue +++ b/pages/users/user_luckyDraw/index.vue @@ -305,7 +305,7 @@ .rule { width: 80rpx; height: 120rpx; - background-image: url(@/static/images/right-btn.png); + background-image: url('https://store.tropjoin.com/images/right-btn.png'); background-size: 100%; background-repeat: no-repeat; position: absolute; @@ -345,7 +345,7 @@ margin: 20rpx 0; line-height: 54rpx; text-align: center; - background: url('@/static/images/font-bg.png') no-repeat 100%; + background: url('https://store.tropjoin.com/images/font-bg.png') no-repeat 100%; background-position: center; } } diff --git a/static/images/box-title.png b/static/images/box-title.png deleted file mode 100644 index e52573f..0000000 Binary files a/static/images/box-title.png and /dev/null differ diff --git a/static/images/box.gif b/static/images/box.gif deleted file mode 100644 index a210f9c..0000000 Binary files a/static/images/box.gif and /dev/null differ diff --git a/static/images/box.png b/static/images/box.png deleted file mode 100644 index 9741170..0000000 Binary files a/static/images/box.png and /dev/null differ diff --git a/static/images/box2.png b/static/images/box2.png deleted file mode 100644 index 3e828a6..0000000 Binary files a/static/images/box2.png and /dev/null differ diff --git a/static/images/empty-box.png b/static/images/empty-box.png deleted file mode 100644 index b7f61ad..0000000 Binary files a/static/images/empty-box.png and /dev/null differ diff --git a/static/images/font-bg.png b/static/images/font-bg.png deleted file mode 100644 index b479439..0000000 Binary files a/static/images/font-bg.png and /dev/null differ diff --git a/static/images/mh-bg.png b/static/images/mh-bg.png deleted file mode 100644 index 6fe9a9c..0000000 Binary files a/static/images/mh-bg.png and /dev/null differ diff --git a/static/images/mh-item-bg.png b/static/images/mh-item-bg.png deleted file mode 100644 index be6bfa8..0000000 Binary files a/static/images/mh-item-bg.png and /dev/null differ diff --git a/static/images/mh-item.png b/static/images/mh-item.png deleted file mode 100644 index f0e66d6..0000000 Binary files a/static/images/mh-item.png and /dev/null differ diff --git a/static/images/mh-title.png b/static/images/mh-title.png deleted file mode 100644 index 3c57c73..0000000 Binary files a/static/images/mh-title.png and /dev/null differ diff --git a/static/images/notBlind.png b/static/images/notBlind.png deleted file mode 100644 index 33bd3c4..0000000 Binary files a/static/images/notBlind.png and /dev/null differ diff --git a/static/images/right-btn.png b/static/images/right-btn.png deleted file mode 100644 index 11a504b..0000000 Binary files a/static/images/right-btn.png and /dev/null differ diff --git a/static/images/sfz1.png b/static/images/sfz1.png deleted file mode 100644 index 6578db2..0000000 Binary files a/static/images/sfz1.png and /dev/null differ diff --git a/static/images/sfz2.png b/static/images/sfz2.png deleted file mode 100644 index 7544740..0000000 Binary files a/static/images/sfz2.png and /dev/null differ diff --git a/static/images/sfz3.png b/static/images/sfz3.png deleted file mode 100644 index 9651b67..0000000 Binary files a/static/images/sfz3.png and /dev/null differ diff --git a/static/images/sfz4.png b/static/images/sfz4.png deleted file mode 100644 index 9651b67..0000000 Binary files a/static/images/sfz4.png and /dev/null differ diff --git a/static/images/shop/1.jpg b/static/images/shop/1.jpg deleted file mode 100644 index e511628..0000000 Binary files a/static/images/shop/1.jpg and /dev/null differ diff --git a/static/images/shop/2.jpg b/static/images/shop/2.jpg deleted file mode 100644 index 3b66636..0000000 Binary files a/static/images/shop/2.jpg and /dev/null differ diff --git a/static/images/shop/3.png b/static/images/shop/3.png deleted file mode 100644 index c6463dc..0000000 Binary files a/static/images/shop/3.png and /dev/null differ diff --git a/static/images/shop/4.jpg b/static/images/shop/4.jpg deleted file mode 100644 index 22af654..0000000 Binary files a/static/images/shop/4.jpg and /dev/null differ diff --git a/static/images/shop/index-tab.png b/static/images/shop/index-tab.png deleted file mode 100644 index b156895..0000000 Binary files a/static/images/shop/index-tab.png and /dev/null differ diff --git a/static/images/shop/tab1.png b/static/images/shop/tab1.png deleted file mode 100644 index ba6a01c..0000000 Binary files a/static/images/shop/tab1.png and /dev/null differ diff --git a/static/images/shop/tab10.png b/static/images/shop/tab10.png deleted file mode 100644 index 6789913..0000000 Binary files a/static/images/shop/tab10.png and /dev/null differ diff --git a/static/images/shop/tab2.png b/static/images/shop/tab2.png deleted file mode 100644 index 0962151..0000000 Binary files a/static/images/shop/tab2.png and /dev/null differ diff --git a/static/images/shop/tab3.png b/static/images/shop/tab3.png deleted file mode 100644 index 341118d..0000000 Binary files a/static/images/shop/tab3.png and /dev/null differ diff --git a/static/images/shop/tab4.png b/static/images/shop/tab4.png deleted file mode 100644 index d18c795..0000000 Binary files a/static/images/shop/tab4.png and /dev/null differ diff --git a/static/images/shop/tab5.png b/static/images/shop/tab5.png deleted file mode 100644 index c5abc70..0000000 Binary files a/static/images/shop/tab5.png and /dev/null differ diff --git a/static/images/shop/tab6.png b/static/images/shop/tab6.png deleted file mode 100644 index d8a3815..0000000 Binary files a/static/images/shop/tab6.png and /dev/null differ diff --git a/static/images/shop/tab7.png b/static/images/shop/tab7.png deleted file mode 100644 index f996272..0000000 Binary files a/static/images/shop/tab7.png and /dev/null differ diff --git a/static/images/shop/tab8.png b/static/images/shop/tab8.png deleted file mode 100644 index b5c5754..0000000 Binary files a/static/images/shop/tab8.png and /dev/null differ diff --git a/static/images/shop/tab9.png b/static/images/shop/tab9.png deleted file mode 100644 index ed285dc..0000000 Binary files a/static/images/shop/tab9.png and /dev/null differ