From 4cd67cafe34b7159bf50907a2571ffc35d90faa0 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Mon, 11 Nov 2024 18:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- page_components/eletj.vue | 4 - page_components/peizhi.vue | 95 +++++---------- page_fenbao/editshenhe.vue | 78 +++++++----- .../statulist/myshop/editshop/index.vue | 87 ++++++++++---- page_fenbao/statulist/myshop/shopxx/index.vue | 113 ++++++++++++------ .../statulist/taocanlist/addtaocan/index.vue | 101 +++++++++++----- page_user/cbRecord.vue | 12 +- page_user/sbdetail.vue | 59 ++++----- pages.json | 7 +- pages/daili/index.vue | 6 +- pages/index/index.vue | 19 ++- pages/shouye/index.vue | 5 +- 12 files changed, 349 insertions(+), 237 deletions(-) diff --git a/page_components/eletj.vue b/page_components/eletj.vue index a8ab7b6..bc1a506 100644 --- a/page_components/eletj.vue +++ b/page_components/eletj.vue @@ -687,13 +687,9 @@ }, // 点击默认返回首页 btns() { - // if(this.opflag){ - // uni.navigateBack() - // }else{ uni.reLaunch({ url: '/pages/shouye/index' }) - // } }, // 点击立即支付订单 btnljzf() { diff --git a/page_components/peizhi.vue b/page_components/peizhi.vue index 9a334fe..ffbd0ea 100644 --- a/page_components/peizhi.vue +++ b/page_components/peizhi.vue @@ -4,80 +4,45 @@ title-size='36' height='50'> - 营业时间 + + {{ksyy}} + -- + {{jsyy}} + + + {{ksyy}} -- {{jsyy}} + - - - - - - 是否展示店铺 - - - - 是否允许在非营业时间使用 - - - - + + + 是否展示店铺 + + + + 是否允许在非营业时间使用 + + + + + + + 是否展示店铺 + + + + 是否允许在非营业时间使用 + + + + 配置 diff --git a/page_fenbao/editshenhe.vue b/page_fenbao/editshenhe.vue index 30822e4..db149b3 100644 --- a/page_fenbao/editshenhe.vue +++ b/page_fenbao/editshenhe.vue @@ -6,14 +6,25 @@ 店铺名称 - - + - - + 店铺类型 - + + + {{selectortext == '' ? '请选择商铺类型' : selectortext}} + + + + + + + + - 联系人 - + 客服名称 + - 联系电话 - + 客服电话 + 详细地址 - - + + + {{xqdz == '' ? '请选择详细地址' : xqdz}} + + + + + - + size="32" > + + + {{selectortext == '' ? '请选择商铺类型' : selectortext}} + + + + + + + + - + + + {{xqdz == '' ? '请选择详细地址' : xqdz}} + + + + + + size="32" > + - - + + + + + + + + + + + @@ -404,7 +443,7 @@ } }) }, - btn() { + btnzfb() { let _this = this let math = 'static/' + _this.$u.guid(20) uni.chooseImage({ @@ -463,7 +502,6 @@ position: fixed; top: 0; left: 0; - color: #666; .box { width: 750rpx; @@ -474,7 +512,7 @@ .list { width: 680rpx; - height: 800rpx; + height: 1060rpx; background: #FFFFFF; border-radius: 24rpx 24rpx 24rpx 24rpx; margin: auto; @@ -511,7 +549,8 @@ width: 100%; display: flex; justify-content: space-between; - padding-right: 45rpx; + padding-right: 45rpx; + .lt { padding-top: 40rpx; @@ -528,8 +567,8 @@ } .imgbox { - width: 33%; - + width: 28%; + image { width: 142rpx; height: 142rpx; @@ -542,20 +581,20 @@ display: flex; justify-content: space-between; margin-top: 34rpx; - + align-items: center; .tit { margin-top: 10rpx; font-size: 32rpx; color: #3D3D3D; } - + .but { width: 462rpx; height: 70rpx; background: #F0F0F0; border-radius: 12rpx 12rpx 12rpx 12rpx; position: relative; - + input { height: 70rpx; line-height: 70rpx; @@ -597,7 +636,7 @@ display: flex; justify-content: space-between; margin-top: 34rpx; - + align-items: center; .tit { margin-top: 12rpx; font-size: 32rpx; diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue index f33b530..9fe1d57 100644 --- a/page_fenbao/statulist/myshop/shopxx/index.vue +++ b/page_fenbao/statulist/myshop/shopxx/index.vue @@ -10,13 +10,26 @@ 店铺类型 - + + + {{selectortext == '' ? '请选择商铺类型' : selectortext}} + + + + + + + + 营业时间 + style="display: flex;justify-content: space-between;padding: 0 20rpx;box-sizing: border-box;line-height: 70rpx;"> {{ksyy}} -- @@ -39,9 +52,17 @@ 详细地址 - + + + {{xqdz == '' ? '请选择详细地址' : xqdz}} + + + + + + size="32" > + @@ -63,17 +84,32 @@ + + + + + + - + + @@ -402,33 +438,34 @@ } }) }, - // btn() { - // let _this = this - // let math = 'static/' + _this.$u.guid(20) - // uni.chooseImage({ - // count: 1, - // type: 'all', - // success(res) { - // const tempFilePaths = res.tempFiles - // wx.uploadFile({ - // url: 'https://up-z2.qiniup.com', - // name: 'file', - // filePath: tempFilePaths[0].path, - // formData: { - // token: _this.token, //后端返回的token - // key: 'smartmeter/img/' + math - // }, - // success: function(res) { - // let str = JSON.parse(res.data) - // console.log(str.key) - // _this.userImgs = 'https://api.ccttiot.com/' + str.key - // _this.imglist = _this.userImgs - // _this.imgflag = false - // } - // }); - // } - // }) - // }, + // 支付宝使用 + btnzfb() { + let _this = this + let math = 'static/' + _this.$u.guid(20) + uni.chooseImage({ + count: 1, + type: 'all', + success(res) { + const tempFilePaths = res.tempFiles + wx.uploadFile({ + url: 'https://up-z2.qiniup.com', + name: 'file', + filePath: tempFilePaths[0].path, + formData: { + token: _this.token, //后端返回的token + key: 'smartmeter/img/' + math + }, + success: function(res) { + let str = JSON.parse(res.data) + console.log(str.key) + _this.userImgs = 'https://api.ccttiot.com/' + str.key + _this.imglist = _this.userImgs + _this.imgflag = false + } + }); + } + }) + }, } } @@ -526,7 +563,7 @@ } .imgbox { - width: 33%; + width: 28%; image { width: 142rpx; @@ -540,7 +577,7 @@ display: flex; justify-content: space-between; margin-top: 34rpx; - + align-items: center; .tit { margin-top: 10rpx; font-size: 32rpx; @@ -595,7 +632,7 @@ display: flex; justify-content: space-between; margin-top: 34rpx; - + align-items: center; .tit { margin-top: 12rpx; font-size: 32rpx; diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue index 787003a..8fdde27 100644 --- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue +++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue @@ -83,12 +83,58 @@ - - + + - - 单价 每 {{timetxt}} + 单价时间 + 每 + + + + + 金额 元 + + + + + + + 单价 + 每 + 度数 度 + + + + + + + {{item.name}} + + + + + 元 + + + + + + + + + + 单价时间 + 每 + {{timetxt}} @@ -102,27 +148,21 @@ - - 单价 每 度 + 单价 + 每 + 度 - 元 - - - 消费金额为单价的倍数，结束订单后将返回剩余预存款 - + 消费金额为单价的倍数，结束订单后将返回剩余预存款 + @@ -303,7 +343,7 @@ 剩余时间不足语音提示 - 剩余时长 分钟 + 剩余时长 分钟 仅限于语音版设备并在线状态才能正常使用！ @@ -471,21 +511,22 @@ this.getuser() this.getxieyi() if (uni.getStorageSync('tcidlist')) { + this.deviceList = [] this.deviceList = uni.getStorageSync('tcidlist') - function uniqueByProperty(arr, prop) { - const seen = new Set(); - return arr.filter(item => { - const val = item[prop]; - if (seen.has(val)) { - return false; - } else { - seen.add(val); - return true; - } - }); - } - // 使用该函数对 this.deviceList 进行去重，假设我们基于 'id' 属性进行去重 - this.deviceList = uniqueByProperty(this.deviceList, 'id'); + // function uniqueByProperty(arr, prop) { + // const seen = new Set(); + // return arr.filter(item => { + // const val = item[prop]; + // if (seen.has(val)) { + // return false; + // } else { + // seen.add(val); + // return true; + // } + // }); + // } + // // 使用该函数对 this.deviceList 进行去重，假设我们基于 'id' 属性进行去重 + // this.deviceList = uniqueByProperty(this.deviceList, 'id'); console.log(this.deviceList) } setTimeout(() => { diff --git a/page_user/cbRecord.vue b/page_user/cbRecord.vue index 84b3406..886e8a6 100644 --- a/page_user/cbRecord.vue +++ b/page_user/cbRecord.vue @@ -1,7 +1,15 @@