From 6079fc4d3e6a20063665b0e58332074944e1a93f Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 14 Sep 2022 11:03:15 +0800 Subject: [PATCH] 服务的优化，主包缩减优化 --- app.json | 5 +++-- images/gt.png | Bin 1286 -> 0 bytes packageE/pages/user/user_fw/user_fw.js | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/user/user_fw/user_fw.json | 7 +++++++ packageE/pages/user/user_fw/user_fw.wxml | 17 +++++++++++++++++ packageE/pages/user/user_fw/user_fw.wxss | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/user/index/index.js | 2 +- pages/user/user_fw/user_fw.js | 87 --------------------------------------------------------------------------------------- pages/user/user_fw/user_fw.json | 7 ------- pages/user/user_fw/user_fw.wxml | 17 ----------------- pages/user/user_fw/user_fw.wxss | 56 -------------------------------------------------------- pages/user/userqy/userqy.js | 2 +- 12 files changed, 172 insertions(+), 171 deletions(-) delete mode 100644 images/gt.png create mode 100644 packageE/pages/user/user_fw/user_fw.js create mode 100644 packageE/pages/user/user_fw/user_fw.json create mode 100644 packageE/pages/user/user_fw/user_fw.wxml create mode 100644 packageE/pages/user/user_fw/user_fw.wxss delete mode 100644 pages/user/user_fw/user_fw.js delete mode 100644 pages/user/user_fw/user_fw.json delete mode 100644 pages/user/user_fw/user_fw.wxml delete mode 100644 pages/user/user_fw/user_fw.wxss diff --git a/app.json b/app.json index f9d7122..7b545a5 100644 --- a/app.json +++ b/app.json @@ -33,7 +33,7 @@ "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", - "pages/user/user_fw/user_fw", + "pages/user/grow_value/grow_value", "pages/payment/pay_success/pay_success", "pages/user/plus/plus", @@ -208,7 +208,8 @@ "name": "pack5", "pages": [ "pages/togoin/togoin", - "pages/user/Detailed/Detailed" + "pages/user/Detailed/Detailed", + "pages/user/user_fw/user_fw" ] } diff --git a/images/gt.png b/images/gt.png deleted file mode 100644 index 5e68248..0000000 Binary files a/images/gt.png and /dev/null differ diff --git a/packageE/pages/user/user_fw/user_fw.js b/packageE/pages/user/user_fw/user_fw.js new file mode 100644 index 0000000..548a5be --- /dev/null +++ b/packageE/pages/user/user_fw/user_fw.js @@ -0,0 +1,87 @@ +// pages/user/userfw/userfw.js +var e = getApp(),os = e.globalData.setting; +var utils = require('../../../../utils/util.js'); +var regeneratorRuntime = require('../../../../utils/runtime.js'); + +Page({ + /** + * 页面的初始数据 + */ + data: { + qr_code_object:{val:"12121",content:"请将二维码展示给核销员，服务更快捷！"}, + fw_list:null, + iurl:os.imghost, + userinfo:null, + GradeId:null, + FormId:null, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + var FormId=options.FormId; + var GradeId=options.gradeId; + var userinfo=getApp().globalData.userInfo; + if(userinfo==null){ + //界面必须使用warn 做ID,并调用 + getApp().my_warnning("会员为空",0,this); + return false; + } + + this.setData({GradeId:GradeId,FormId:FormId,userinfo:userinfo}); + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: async function () { + var th = this; + var fw_list=null; + //--获取列表-- + await getApp().request.promiseGet("/api/weshop/users/grade/wechat/sm/page", { + data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id} + }).then(res => { + fw_list = res.data.data.pageData; + }) + + th.setData({fw_list:fw_list}); + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /*-- 打开服务项目 --*/ + open_fw:function (e) { + var th=this; + var ind=e.currentTarget.dataset.ind; + var item= this.data.fw_list[ind]; + + //小于0要提示 + if(item.ObtainTimes<=0){ + getApp().my_warnning("该服务已经使用完",0,th); + return false; + } + + var ewm="^"+this.data.userinfo.erpvipid+"|"+item.Id+"|4|TY01|"; + var tt=this.format_time(1); + ewm=ewm+tt; + th.data.qr_code_object.val=ewm; + th.data.qr_code_object.is_fw=1; + var qc_com = this.selectComponent("#qc_com"); //组件的id + qc_com.open(th.data.qr_code_object) + }, + + format_time:function(isFull) { + var d = new Date(); + var m = d.getMonth() + 1; if(m<10) m="0"+m; + var dd = d.getDate(); if (dd < 10) dd = "0" + dd; + var fm=[d.getFullYear(),m,dd ].join('-'); + if(isFull==1) + fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') + return fm; + }, +}) \ No newline at end of file diff --git a/packageE/pages/user/user_fw/user_fw.json b/packageE/pages/user/user_fw/user_fw.json new file mode 100644 index 0000000..88d15ea --- /dev/null +++ b/packageE/pages/user/user_fw/user_fw.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "服务项目", + "usingComponents": { + "qr_code": "/components/qr_code/qr_code", + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageE/pages/user/user_fw/user_fw.wxml b/packageE/pages/user/user_fw/user_fw.wxml new file mode 100644 index 0000000..54d0c30 --- /dev/null +++ b/packageE/pages/user/user_fw/user_fw.wxml @@ -0,0 +1,17 @@ + + + + + {{item.PrivilegeName}} + 剩余次数：{{item.ObtainTimes}} + + 有效日期至 {{item.Validay}} + + 立即使用 + 立即使用 + + + + + \ No newline at end of file diff --git a/packageE/pages/user/user_fw/user_fw.wxss b/packageE/pages/user/user_fw/user_fw.wxss new file mode 100644 index 0000000..ce0532e --- /dev/null +++ b/packageE/pages/user/user_fw/user_fw.wxss @@ -0,0 +1,56 @@ +.xc-page{ + width: 100%; + height: 100%; +} +.xc-page .items{ + display: inline-block; + width: 43%; + height:396rpx; + margin-left: 33rpx; + border:2rpx solid #d8d8d8; + box-shadow:10rpx 10rpx 20rpx 6rpx #eee; + margin-top: 33rpx; + border-radius: 20rpx; + padding-top: 30rpx; +} +.xc-page .items .items-img{ + width: 112rpx; + height: 112rpx; + +} +.xc-page .items .items-name{ + font-weight:600; + height:90rpx; +padding:0 16rpx; +} +.xc-page .items .items-frequency{ + margin-top:15rpx; + color:#adadad; +} +.xc-page .items .items-time{ + color:#adadad; + margin-top:6rpx +} +.xc-page .items .items-use{ + border-radius:25rpx; + width: 144rpx; + height: 41rpx; + margin-left:85rpx; + margin-top:35rpx; + line-height:41rpx; +font-size: 22rpx; + +} +.on{ + background: #fe658b; +} +.sn{ + background: #c9c9c9; +} + +.three-level-word{ + font-size:32rpx; +} +.four-level-word{ + font-size:27rpx; +} \ No newline at end of file diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 9e8a4df..569a443 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -711,7 +711,7 @@ Page({ url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); break; case "02": - getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id); + getApp().goto("/packageE/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id); break; case "03": getApp().goto("/pages/user/user_spsy/user_spsy?img=" + diff --git a/pages/user/user_fw/user_fw.js b/pages/user/user_fw/user_fw.js deleted file mode 100644 index d3a057f..0000000 --- a/pages/user/user_fw/user_fw.js +++ /dev/null @@ -1,87 +0,0 @@ -// pages/user/userfw/userfw.js -var e = getApp(),os = e.globalData.setting; -var utils = require('../../../utils/util.js'); -var regeneratorRuntime = require('../../../utils/runtime.js'); - -Page({ - /** - * 页面的初始数据 - */ - data: { - qr_code_object:{val:"12121",content:"请将二维码展示给核销员，服务更快捷！"}, - fw_list:null, - iurl:os.imghost, - userinfo:null, - GradeId:null, - FormId:null, - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - var FormId=options.FormId; - var GradeId=options.gradeId; - var userinfo=getApp().globalData.userInfo; - if(userinfo==null){ - //界面必须使用warn 做ID,并调用 - getApp().my_warnning("会员为空",0,this); - return false; - } - - this.setData({GradeId:GradeId,FormId:FormId,userinfo:userinfo}); - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: async function () { - var th = this; - var fw_list=null; - //--获取列表-- - await getApp().request.promiseGet("/api/weshop/users/grade/wechat/sm/page", { - data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id} - }).then(res => { - fw_list = res.data.data.pageData; - }) - - th.setData({fw_list:fw_list}); - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /*-- 打开服务项目 --*/ - open_fw:function (e) { - var th=this; - var ind=e.currentTarget.dataset.ind; - var item= this.data.fw_list[ind]; - - //小于0要提示 - if(item.ObtainTimes<=0){ - getApp().my_warnning("该服务已经使用完",0,th); - return false; - } - - var ewm="^"+this.data.userinfo.erpvipid+"|"+item.Id+"|4|TY01|"; - var tt=this.format_time(1); - ewm=ewm+tt; - th.data.qr_code_object.val=ewm; - th.data.qr_code_object.is_fw=1; - var qc_com = this.selectComponent("#qc_com"); //组件的id - qc_com.open(th.data.qr_code_object) - }, - - format_time:function(isFull) { - var d = new Date(); - var m = d.getMonth() + 1; if(m<10) m="0"+m; - var dd = d.getDate(); if (dd < 10) dd = "0" + dd; - var fm=[d.getFullYear(),m,dd ].join('-'); - if(isFull==1) - fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') - return fm; - }, -}) \ No newline at end of file diff --git a/pages/user/user_fw/user_fw.json b/pages/user/user_fw/user_fw.json deleted file mode 100644 index 88d15ea..0000000 --- a/pages/user/user_fw/user_fw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "服务项目", - "usingComponents": { - "qr_code": "/components/qr_code/qr_code", - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/user/user_fw/user_fw.wxml b/pages/user/user_fw/user_fw.wxml deleted file mode 100644 index 838b119..0000000 --- a/pages/user/user_fw/user_fw.wxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {{item.PrivilegeName}} - 剩余次数：{{item.ObtainTimes}} - - 有效日期至 {{item.Validay}} - - 立即使用 - 立即使用 - - - - - \ No newline at end of file diff --git a/pages/user/user_fw/user_fw.wxss b/pages/user/user_fw/user_fw.wxss deleted file mode 100644 index ce0532e..0000000 --- a/pages/user/user_fw/user_fw.wxss +++ /dev/null @@ -1,56 +0,0 @@ -.xc-page{ - width: 100%; - height: 100%; -} -.xc-page .items{ - display: inline-block; - width: 43%; - height:396rpx; - margin-left: 33rpx; - border:2rpx solid #d8d8d8; - box-shadow:10rpx 10rpx 20rpx 6rpx #eee; - margin-top: 33rpx; - border-radius: 20rpx; - padding-top: 30rpx; -} -.xc-page .items .items-img{ - width: 112rpx; - height: 112rpx; - -} -.xc-page .items .items-name{ - font-weight:600; - height:90rpx; -padding:0 16rpx; -} -.xc-page .items .items-frequency{ - margin-top:15rpx; - color:#adadad; -} -.xc-page .items .items-time{ - color:#adadad; - margin-top:6rpx -} -.xc-page .items .items-use{ - border-radius:25rpx; - width: 144rpx; - height: 41rpx; - margin-left:85rpx; - margin-top:35rpx; - line-height:41rpx; -font-size: 22rpx; - -} -.on{ - background: #fe658b; -} -.sn{ - background: #c9c9c9; -} - -.three-level-word{ - font-size:32rpx; -} -.four-level-word{ - font-size:27rpx; -} \ No newline at end of file diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js index 58789d0..f0f6af4 100644 --- a/pages/user/userqy/userqy.js +++ b/pages/user/userqy/userqy.js @@ -197,7 +197,7 @@ Page({ +url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id); break; case "02": - getApp().goto("/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id); + getApp().goto("/packageE/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id); break; case "03": getApp().goto("/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id); -- libgit2 0.21.4