From 13e85312b3b01d8aebb99f6274a612a00e73ebaa Mon Sep 17 00:00:00 2001 From: season Date: Thu, 27 Feb 2020 09:27:37 +0800 Subject: [PATCH] 删除无用 --- pages/error/error.js | 80 -------------------------------------------------------------------------------- pages/error/error.json | 1 - pages/error/error.wxml | 8 -------- pages/error/error.wxss | 26 -------------------------- pages/getphone/getphone.js | 137 ----------------------------------------------------------------------------------------------------------------------------------------- pages/getphone/getphone.json | 6 ------ pages/getphone/getphone.wxml | 10 ---------- pages/getphone/getphone.wxss | 40 ---------------------------------------- pages/test/zhuli_test.js | 60 ------------------------------------------------------------ pages/test/zhuli_test.json | 6 ------ pages/test/zhuli_test.wxml | 22 ---------------------- pages/test/zhuli_test.wxss | 146 -------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/account_list/account_list.js | 48 ------------------------------------------------ pages/user/account_list/account_list.json | 3 --- pages/user/account_list/account_list.wxml | 19 ------------------- pages/user/account_list/account_list.wxss | 56 -------------------------------------------------------- pages/user/message_notice/message_notice.js | 42 ------------------------------------------ pages/user/message_notice/message_notice.json | 3 --- pages/user/message_notice/message_notice.wxml | 20 -------------------- pages/user/message_notice/message_notice.wxss | 37 ------------------------------------- pages/user/points_list/points_list.js | 48 ------------------------------------------------ pages/user/points_list/points_list.json | 3 --- pages/user/points_list/points_list.wxml | 19 ------------------- pages/user/points_list/points_list.wxss | 56 -------------------------------------------------------- pages/user/recharge_list/recharge_list.js | 32 -------------------------------- pages/user/recharge_list/recharge_list.json | 3 --- pages/user/recharge_list/recharge_list.wxml | 14 -------------- pages/user/recharge_list/recharge_list.wxss | 42 ------------------------------------------ pages/user/userinfo_edit/userinfo_edit.js | 107 ----------------------------------------------------------------------------------------------------------- pages/user/userinfo_edit/userinfo_edit.json | 4 ---- pages/user/userinfo_edit/userinfo_edit.wxml | 63 --------------------------------------------------------------- pages/user/userinfo_edit/userinfo_edit.wxss | 108 ------------------------------------------------------------------------------------------------------------ pages/user/visit_log/visit_log.js | 48 ------------------------------------------------ pages/user/visit_log/visit_log.json | 3 --- pages/user/visit_log/visit_log.wxml | 22 ---------------------- pages/user/visit_log/visit_log.wxss | 53 ----------------------------------------------------- 36 files changed, 0 insertions(+), 1395 deletions(-) delete mode 100644 pages/error/error.js delete mode 100644 pages/error/error.json delete mode 100644 pages/error/error.wxml delete mode 100644 pages/error/error.wxss delete mode 100644 pages/getphone/getphone.js delete mode 100644 pages/getphone/getphone.json delete mode 100644 pages/getphone/getphone.wxml delete mode 100644 pages/getphone/getphone.wxss delete mode 100644 pages/test/zhuli_test.js delete mode 100644 pages/test/zhuli_test.json delete mode 100644 pages/test/zhuli_test.wxml delete mode 100644 pages/test/zhuli_test.wxss delete mode 100644 pages/user/account_list/account_list.js delete mode 100644 pages/user/account_list/account_list.json delete mode 100644 pages/user/account_list/account_list.wxml delete mode 100644 pages/user/account_list/account_list.wxss delete mode 100644 pages/user/message_notice/message_notice.js delete mode 100644 pages/user/message_notice/message_notice.json delete mode 100644 pages/user/message_notice/message_notice.wxml delete mode 100644 pages/user/message_notice/message_notice.wxss delete mode 100644 pages/user/points_list/points_list.js delete mode 100644 pages/user/points_list/points_list.json delete mode 100644 pages/user/points_list/points_list.wxml delete mode 100644 pages/user/points_list/points_list.wxss delete mode 100644 pages/user/recharge_list/recharge_list.js delete mode 100644 pages/user/recharge_list/recharge_list.json delete mode 100644 pages/user/recharge_list/recharge_list.wxml delete mode 100644 pages/user/recharge_list/recharge_list.wxss delete mode 100644 pages/user/userinfo_edit/userinfo_edit.js delete mode 100644 pages/user/userinfo_edit/userinfo_edit.json delete mode 100644 pages/user/userinfo_edit/userinfo_edit.wxml delete mode 100644 pages/user/userinfo_edit/userinfo_edit.wxss delete mode 100644 pages/user/visit_log/visit_log.js delete mode 100644 pages/user/visit_log/visit_log.json delete mode 100644 pages/user/visit_log/visit_log.wxml delete mode 100644 pages/user/visit_log/visit_log.wxss diff --git a/pages/error/error.js b/pages/error/error.js deleted file mode 100644 index f0bf229..0000000 --- a/pages/error/error.js +++ /dev/null @@ -1,80 +0,0 @@ -var t = require("../../utils/common.js");var os=getApp().globalData.setting; -Page({ - data:{ - store:null, - imghots: os.imghost, - msg:"", - }, - - onLoad:function(t){ - var th=this,app = getApp(); - app.getConfig(function(e){ - th.setData({ store:e,msg:t.msg}); - }) - }, - - getphone: function(e) { - var that = this; - var app=getApp(),a=app; - //此处授权得到userInfo - console.log("getphone"); - e=e.detail; - console.log(e); - //接下来写业务代码登录 - //最后，记得返回刚才的页面 - if (e.encryptedData==undefined){ - wx.navigateTo({ - url: '/pages/user/binding_info/binding_info', - }) - return false; - } - var r=getApp().globalData.getu; - var sessionKey = getApp().globalData.sessionKey; - var openid = getApp().globalData.openid; - var dd = { - oauth: "miniapp", - nickname: r.nickName, - head_pic: r.avatarUrl, - sex: r.gender, - terminal: "miniapp", - sessionKey: sessionKey, - openid:openid, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: a.globalData.setting.stoid, - }; - console.log(dd); - - app.request.get("/api/weshop/users/thirdLogin", { - data: dd, - success: function (e) { - console.log("thirdLogin"); - console.log(e); - if (e.data.code == 0) { - app.globalData.user_id = e.data.data.user_id; - } else { - return app.showWarning("授权登入失败！"); - } - wx.setStorageSync("isAuth", !0), a.globalData.userInfo = e.data.data, a.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); - wx.navigateBack({ delta: 1}) - - }, - failStatus: function (t) { - return "100" === t.data.result ? (i.goHome(), wx.navigateTo({ - url: "/pages/user/binding_info/binding_info?nickName=" + r.nickName + "&userHeadPic=" + r.avatarUrl - }), !1) : (i.clearAuth(), i.alertLoginErrorAndGoHome(t.data.msg), a.request.post("/api/user/logout", { - isShowLoading: !1, - data: { - token: a.request.getToken() - }, - failStatus: function () { - return !1; - } - }), !1); - }, - fail: function (t) { - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; - } - }); - } -}); diff --git a/pages/error/error.json b/pages/error/error.json deleted file mode 100644 index 9e26dfe..0000000 --- a/pages/error/error.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/pages/error/error.wxml b/pages/error/error.wxml deleted file mode 100644 index 96b66cd..0000000 --- a/pages/error/error.wxml +++ /dev/null @@ -1,8 +0,0 @@ - - - - {{store.store_name}} - {{store.store_desc}} - {{msg}} - - \ No newline at end of file diff --git a/pages/error/error.wxss b/pages/error/error.wxss deleted file mode 100644 index f09d0b3..0000000 --- a/pages/error/error.wxss +++ /dev/null @@ -1,26 +0,0 @@ -.all_page{ - position: fixed; - height: 100%; - width: 100%; - background: #fff; - justify-content: center;/*水平居中*/ -} -.all_page .content{ - font-size: 30rpx; - text-align: center; - height: 400px; - width: 100%; - position: absolute; - top: 50%; - margin-top:-200px; -} -.logo{width: 140rpx; height: 140rpx; border-radius:50% } -.all_page .content .title{ - font-size: 36rpx; margin: 20rpx 0 -} - -.all_page .err{ - color:red; - font-size: 36rpx; - margin-top: 300rpx; -} \ No newline at end of file diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js deleted file mode 100644 index d000bf6..0000000 --- a/pages/getphone/getphone.js +++ /dev/null @@ -1,137 +0,0 @@ -var t = require("../../utils/common.js");var os=getApp().globalData.setting; -Page({ - data:{ - store:null, - imghots: os.imghost, - }, - - onLoad: function (options) { - //--判断是否有接受到邀请人的ID-- - if(options.first_leader){ - this.setData({first_leader:options.first_leader}); - } - }, - onShow:function(){ - var th=this,app = getApp(); - var sessionKey = getApp().globalData.sessionKey; - var openid = getApp().globalData.openid; - - if (openid == "" || openid == null) { - - if (getApp().globalData.userInfo) - openid = getApp().globalData.userInfo.weapp_openid; - } - var r = getApp().globalData.getu; - - if (openid == "" || openid == null || r==null ){ - getApp().globalData.user_id=null; - getApp().globalData.userInfo=null; - console.log("openid"); - wx.navigateTo({ url: '/pages/togoin/togoin', }) - return false; - } - var user_info=getApp().globalData.userInfo; - console.log("getphone"); - - if(user_info!=null && user_info.mobile!=undefined && user_info.mobile!="" && user_info.mobile!=null){ - wx.navigateBack({ - delta: 1 - }) - } - - app.getConfig(function(e){ - th.setData({ store:e}); - }) - }, - - getphone: function(e) { - var that = this; - var app=getApp(),a=app; - //此处授权得到userInfo - console.log("getphone"); - - e=e.detail; - console.log(e); - //接下来写业务代码登录 - //最后，记得返回刚才的页面 - if (e.encryptedData==undefined){ - /*--- - wx.navigateTo({ - url: '/pages/user/binding_info/binding_info', - })--*/ - return app.my_warnning("登录需要授权手机号码！", 0, that); - return false; - } - var r=getApp().globalData.getu; - var sessionKey = getApp().globalData.sessionKey; - var openid = getApp().globalData.openid; - - console.log(sessionKey,openid); - that.save_the_data(r,e,sessionKey,openid) - - }, - - save_the_data:function (r,e,sessionKey,openid) { - var app=getApp(),a=app,th=this; - var dd = { - oauth: "miniapp", - nickname: r.nickName, - head_pic: r.avatarUrl, - sex: r.gender, - terminal: "miniapp", - sessionKey: sessionKey, - openid:openid, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: getApp().globalData.setting.stoid, - }; - //--如果有邀请人的时候-- - if(th.data.first_leader){ - dd.first_leader=th.data.first_leader; - } - - console.log(dd); - app.request.get("/api/weshop/users/thirdLogin", { - data: dd, - success: function (e) { - console.log("thirdLogin"); - console.log(e); - if (e.data.code == 0) { - app.globalData.user_id = e.data.data.user_id; - } else { - return app.showWarning("授权登入失败！"+e.data.msg); - } - - wx.setStorageSync("userinfo",e.data.data); - wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); - wx.navigateBack({ delta: 1}) - - }, - failStatus: function (t) { - /*--- - return "100" === t.data.result ? (i.goHome(), wx.navigateTo({ - url: "/pages/user/binding_info/binding_info?nickName=" + r.nickName + "&userHeadPic=" + r.avatarUrl - }), !1) : (i.clearAuth(), i.alertLoginErrorAndGoHome(t.data.msg), a.request.post("/api/user/logout", { - isShowLoading: !1, - data: { - token: a.request.getToken() - }, - failStatus: function () { - return !1; - } - }), !1);--*/ - return app.my_warnning("授权登入失败,请稍后再试!", 0, that); - }, - fail: function (t) { - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; - } - }); - }, - - cancle_bind: function () { - getApp().goto('/pages/user/index/index'); - } - - - -}); diff --git a/pages/getphone/getphone.json b/pages/getphone/getphone.json deleted file mode 100644 index fb13409..0000000 --- a/pages/getphone/getphone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "navigationBarTitleText": "绑定手机", - "usingComponents": { - "warn": "/components/long_warn/long_warn" - } -} diff --git a/pages/getphone/getphone.wxml b/pages/getphone/getphone.wxml deleted file mode 100644 index e511fa5..0000000 --- a/pages/getphone/getphone.wxml +++ /dev/null @@ -1,10 +0,0 @@ - - - - {{store.store_name}} - {{store.store_desc}} - - 暂不绑定 - - - \ No newline at end of file diff --git a/pages/getphone/getphone.wxss b/pages/getphone/getphone.wxss deleted file mode 100644 index 3756909..0000000 --- a/pages/getphone/getphone.wxss +++ /dev/null @@ -1,40 +0,0 @@ -.all_page{ - position: fixed; - height: 100%; - width: 100%; - background: #fff; - justify-content: center;/*水平居中*/ -} -.all_page .content{ - font-size: 30rpx; - text-align: center; - height: 400px; - width: 100%; - position: absolute; - top: 50%; - margin-top:-200px; -} -.logo{width: 140rpx; height: 140rpx; border-radius:50% } -.all_page .content .title{ - font-size: 36rpx; margin: 20rpx 0 -} - -.all_page .btn{ - height: 80rpx; - line-height: 80rpx; - width: 580rpx; - background: #fc661f; - color:#fff; - font-size: 32rpx; - margin-top: 100rpx; - border-radius: 5rpx; -} -.all_page .btn2{ - height: 80rpx; - line-height: 80rpx; - width: 580rpx; - color:#999; - font-size: 32rpx; - border-radius: 5rpx; - margin-top: 10rpx; -} \ No newline at end of file diff --git a/pages/test/zhuli_test.js b/pages/test/zhuli_test.js deleted file mode 100644 index 452f7cd..0000000 --- a/pages/test/zhuli_test.js +++ /dev/null @@ -1,60 +0,0 @@ -var e = getApp(), - a = e.globalData.setting, - os = a; -var regeneratorRuntime = require('../../utils/runtime.js'); -Page({ - - /** - * 页面的初始数据 - */ - data: { - iurl: a.imghost, //图片地址前缀\ - taskId:0, - mobile:0, - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - wx.setNavigationBarTitle({ - title: "测试帮忙助力", - }) - var th = this; - var taskId=options.taskId; - this.data.taskId=taskId; - }, - - getphoneValue:function(e){ - this.data.mobile=e.detail.value; - }, - //测试正在进行任务 - bindReg:async function () { - var userinfo=null; - await getApp().request.promiseGet("/api/weshop/users/page",{ - data:{mobile:this.data.mobile,store_id:os.stoid} - }).then(res=>{ - userinfo=res.data.data.pageData[0]; - }) - if(!userinfo) { - getApp().my_warnning("未找到会员",0,this); return false; - } - - var task=null; - await getApp().request.promiseGet("/api/weshop/marketing/help/help/task/get",{ - data:{taskId:this.data.taskId,storeId:os.stoid,userId:userinfo.user_id} - }).then(res=>{ - task=res.data.data; - }) - if(!task) { - getApp().my_warnning("未找任务",0,this); return false; - } - - if(task.status!=0){ - getApp().my_warnning("任务不是进行中",0,this); return false; - } - var taking=task.id; - getApp().goto("/pages/user/assistance/friend_assistance?tasking=" + taking + "&userId=" + userinfo.user_id); - }, - - -}) diff --git a/pages/test/zhuli_test.json b/pages/test/zhuli_test.json deleted file mode 100644 index 007d140..0000000 --- a/pages/test/zhuli_test.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "navigationBarTitleText": "助力测试专用", - "usingComponents": { - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/test/zhuli_test.wxml b/pages/test/zhuli_test.wxml deleted file mode 100644 index d86ec97..0000000 --- a/pages/test/zhuli_test.wxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - 去帮忙助力 - - - - - - diff --git a/pages/test/zhuli_test.wxss b/pages/test/zhuli_test.wxss deleted file mode 100644 index 11ea42a..0000000 --- a/pages/test/zhuli_test.wxss +++ /dev/null @@ -1,146 +0,0 @@ -page{ - border-top: 3rpx solid #EAEAEC; -} -.index { - position: absolute; width: 100%; - z-index: 1; -} - -.logins { - width: 100%; - padding-top: 60rpx; - padding-bottom: 120rpx; -} - -.login_img { - width: 192rpx; - height: 192rpx; - border-radius: 50% -} - -.input_phone { - height: 55rpx; - line-height: 55rpx; - margin-left:10rpx ; - position: relative; top:10rpx -} - -.input_code { - width: 360rpx; - height: 55rpx; - line-height: 55rpx; - border-radius: 12rpx; - margin-right: 20rpx; - border: 3rpx solid rgb(230, 230, 230); - padding-left: 40rpx; - color:#ef8179 -} - -.codes { - margin-bottom: 65rpx; -} - -.get_code { - width: 176rpx; - height: 65rpx; - line-height: 65rpx; - border:1rpx solid rgb(236, 109, 95); - color: #ed7067; - border-radius: 12rpx; - right: 0; - top:5rpx; -} - -.userlogin { - width: 100%; - height: 95rpx; - line-height: 95rpx; - background-color: #ffc5c0; - color: rgb(255, 255, 255); - margin-bottom: 30rpx; - margin-top: 50rpx - } - -.userlogin.on{ - background-color: #eb6359; -} - -.go_index { - color: #9d9d9d; - margin-bottom: 300rpx; -} - -.sr { - width: 90%; margin: 0 auto; -} - -.checkbox { - width: 25rpx; - height: 25rpx; - color: rgb(0, 0, 0); - margin-right: 50rpx; - margin-bottom: 30rpx -} - -.agrs { - padding: 0rpx 65rpx; -} - -.agreement { - color: rgb(236, 109, 95); - display: initial; -} - -.popup { - position: fixed; - z-index: 10; - background-color: rgba(153, 153, 153, 0.568); - height: 100%; - width: 100%; -} - -.content { - max-height: 800rpx; -min-height: 100rpx; -padding: 60rpx 35rpx; -background-color: rgb(255, 255, 255); -width: 570rpx; -margin-bottom: 70rpx; -overflow-y: scroll; -border-radius: 15rpx; -line-height: 50rpx; -font-size: 26rpx; -color: #545454; - - -} - -.close { - width: 65rpx; - height: 65rpx; -} - -.xy { - display: initial;color: #9c9c9c; line-height: 34rpx -} - -.get_code.on{ - color: #666; -} -.tubiao_set{ - width: 50rpx; height: 64rpx; margin-right:30rpx; position: relative; top:5rpx; -} -.tubiao_set2{ - width: 46rpx; height: 64rpx; margin-right:34rpx; -} -.phone_view{ - border-bottom:1rpx solid #e8e8e8 ; - height: 96rpx; margin-top:50rpx - -} -.phone_view.mt{ - margin-top:20rpx -} -.reg_btn{ - margin-top:40rpx; margin-bottom: 20rpx -} diff --git a/pages/user/account_list/account_list.js b/pages/user/account_list/account_list.js deleted file mode 100644 index 93454ad..0000000 --- a/pages/user/account_list/account_list.js +++ /dev/null @@ -1,48 +0,0 @@ -var t = function(t) { - return t && t.__esModule ? t : { - default: t - }; -}(require("../../../utils/LoadMore.js")), e = getApp(), a = new t.default(), n = require("../../../utils/util.js"); - -Page({ - data: { - url: e.globalData.setting.url, - resourceUrl: e.globalData.setting.resourceUrl, - categories: [ { - name: "全部", - type: "all" - }, { - name: "赚取", - type: "plus" - }, { - name: "消费", - type: "minus" - } ], - activeType: "all", - accounts: null, - currentPage: 1 - }, - onLoad: function(t) { - var e = void 0 === t.type ? this.data.activeType : t.type; - a.init(this, "", "accounts"), this.requestAccountList(e); - }, - changeTab: function(t) { - a.resetConfig(), this.data.accounts = null, this.data.currentPage = 1, this.requestAccountList(t.currentTarget.id); - }, - requestAccountList: function(t) { - var e = this, u = "/api/user/account_list/type/" + t + "?p=" + e.data.currentPage; - this.setData({ - activeType: t - }), a.request(u, function(t) { - e.data.currentPage++, t.data.result.forEach(function(t, e, a) { - t.changeTimeFommat = n.format(t.change_time, "yyyy-MM-dd hh:mm"); - }), wx.stopPullDownRefresh(); - }); - }, - onReachBottom: function() { - a.canloadMore() && this.requestAccountList(this.data.activeType); - }, - onPullDownRefresh: function(t) { - this.data.accounts = null, this.data.currentPage = 1, a.resetConfig(), this.requestAccountList(this.data.activeType); - } -}); \ No newline at end of file diff --git a/pages/user/account_list/account_list.json b/pages/user/account_list/account_list.json deleted file mode 100644 index 1545ce6..0000000 --- a/pages/user/account_list/account_list.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "账户明细" -} \ No newline at end of file diff --git a/pages/user/account_list/account_list.wxml b/pages/user/account_list/account_list.wxml deleted file mode 100644 index d938fc0..0000000 --- a/pages/user/account_list/account_list.wxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {{item.name}} - - - - - - diff --git a/pages/user/account_list/account_list.wxss b/pages/user/account_list/account_list.wxss deleted file mode 100644 index 61b9f09..0000000 --- a/pages/user/account_list/account_list.wxss +++ /dev/null @@ -1,56 +0,0 @@ -page { - background-color: white; -} - -.container { - padding: 20rpx 30rpx; -} - -.navbar { - width: 100%; -} - -.navbar-box { - font-size: 35rpx; - display: inline-block; - width: 33.333333%; - border: 1rpx solid #f8f8f8; - box-sizing: border-box; - text-align: center; - line-height: 85rpx; -} - -.navbar-item-on { - background-color: #e01222; - border-radius: 6rpx; -} - -.account-box { - width: 100%; - font-size: 28rpx; - padding: 20rpx 0; - border-bottom: 1rpx solid #f8f8f8; - padding-left: 5rpx; -} - -.account-item { - display: inline-block; - width: 33.333333%; - word-break: keep-all; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.account-box .price { - color: #e01222; - text-align: center; -} - -.account-box .time { - color: #999999; -} - -.account-box .title { - text-align: center; -} \ No newline at end of file diff --git a/pages/user/message_notice/message_notice.js b/pages/user/message_notice/message_notice.js deleted file mode 100644 index 07a989c..0000000 --- a/pages/user/message_notice/message_notice.js +++ /dev/null @@ -1,42 +0,0 @@ -var t = getApp(), s = t.request, e = require("../../../utils/util.js"); - -Page({ - data: { - url: t.globalData.setting.url, - resourceUrl: t.globalData.setting.resourceUrl, - iurl: t.globalData.setting.imghost, - categories: [ { - name: "全部消息", - status: 0 - }, { - name: "系统消息", - status: 1 - } ], - activeStatus: 0, - messages: null - }, - onLoad: function(t) { - var s = void 0 === t.status ? this.data.activeStatus : t.status; - this.requestMessages(s); - }, - changeTab: function(t) { - this.requestMessages(t.currentTarget.dataset.status); - }, - requestMessages: function(t) { - var a = this; - this.setData({ - activeStatus: t - }), s.get("/api/user/message_list?type=" + t, { - success: function(t) { - t.data.result.forEach(function(t, s, a) { - t.sendTimeFommat = e.format(t.send_time, "yyyy-MM-dd"); - }), a.setData({ - messages: t.data.result - }), wx.stopPullDownRefresh(); - } - }); - }, - onPullDownRefresh: function(t) { - this.requestMessages(this.data.activeStatus); - } -}); \ No newline at end of file diff --git a/pages/user/message_notice/message_notice.json b/pages/user/message_notice/message_notice.json deleted file mode 100644 index e4f4a9e..0000000 --- a/pages/user/message_notice/message_notice.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "消息中心" -} \ No newline at end of file diff --git a/pages/user/message_notice/message_notice.wxml b/pages/user/message_notice/message_notice.wxml deleted file mode 100644 index 53499fd..0000000 --- a/pages/user/message_notice/message_notice.wxml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {{item.name}} - - - - - - {{item.sendTimeFommat}} - {{item.message}} - - - - - 没有找到相关的记录 - 去逛逛 - - diff --git a/pages/user/message_notice/message_notice.wxss b/pages/user/message_notice/message_notice.wxss deleted file mode 100644 index 5421f4f..0000000 --- a/pages/user/message_notice/message_notice.wxss +++ /dev/null @@ -1,37 +0,0 @@ -.type-navbar { - white-space: nowrap; - display: flex; - width: 100%; - height: 80rpx; - background-color: #fff; -} - -.type-box { - width: 50%; - box-sizing: border-box; - font-size: 28rpx; - line-height: 76rpx; - padding: 0 20rpx; - text-align: center; - display: inline-block; - overflow: hidden; -} - -.type-navbar-item { - border-bottom: 4rpx solid #fff; -} - -.type-item-on { - border-bottom: 4rpx solid #e64340; -} - -.msg-box { - background-color: white; - padding: 20rpx 30rpx; - border-bottom: 2px solid #f8f8f8; - font-size: 30rpx; -} - -.msg-time { - padding: 10rpx 0; -} \ No newline at end of file diff --git a/pages/user/points_list/points_list.js b/pages/user/points_list/points_list.js deleted file mode 100644 index fbc9355..0000000 --- a/pages/user/points_list/points_list.js +++ /dev/null @@ -1,48 +0,0 @@ -var t = function(t) { - return t && t.__esModule ? t : { - default: t - }; -}(require("../../../utils/LoadMore.js")), e = getApp(), a = new t.default(), i = require("../../../utils/util.js"); - -Page({ - data: { - url: e.globalData.setting.url, - resourceUrl: e.globalData.setting.resourceUrl, - categories: [ { - name: "全部", - type: "all" - }, { - name: "赚取", - type: "plus" - }, { - name: "消费", - type: "minus" - } ], - activeType: "all", - points: null, - currentPage: 1 - }, - onLoad: function(t) { - var e = void 0 === t.type ? this.data.activeType : t.type; - a.init(this, "", "points"), this.requestPointList(e); - }, - changeTab: function(t) { - a.resetConfig(), this.data.points = null, this.data.currentPage = 1, this.requestPointList(t.currentTarget.id); - }, - requestPointList: function(t) { - var e = this, n = "/api/user/points_list/type/" + t + "?p=" + e.data.currentPage; - this.setData({ - activeType: t - }), a.request(n, function(t) { - e.data.currentPage++, t.data.result.forEach(function(t, e, a) { - t.changeTimeFommat = i.format(t.change_time, "yyyy-MM-dd hh:mm"); - }), wx.stopPullDownRefresh(); - }); - }, - onReachBottom: function() { - a.canloadMore() && this.requestPointList(this.data.activeType); - }, - onPullDownRefresh: function(t) { - this.data.points = null, this.data.currentPage = 1, a.resetConfig(), this.requestPointList(this.data.activeType); - } -}); \ No newline at end of file diff --git a/pages/user/points_list/points_list.json b/pages/user/points_list/points_list.json deleted file mode 100644 index 93a8919..0000000 --- a/pages/user/points_list/points_list.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "积分明细" -} \ No newline at end of file diff --git a/pages/user/points_list/points_list.wxml b/pages/user/points_list/points_list.wxml deleted file mode 100644 index c4b03cd..0000000 --- a/pages/user/points_list/points_list.wxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {{item.name}} - - - - - 描述 - 积分 - 时间 - - - {{item.desc}} - {{item.pay_points}} - {{item.changeTimeFommat}} - - diff --git a/pages/user/points_list/points_list.wxss b/pages/user/points_list/points_list.wxss deleted file mode 100644 index 4de89bd..0000000 --- a/pages/user/points_list/points_list.wxss +++ /dev/null @@ -1,56 +0,0 @@ -page { - background-color: white; -} - -.container { - padding: 20rpx 30rpx; -} - -.navbar { - width: 100%; -} - -.navbar-box { - font-size: 35rpx; - display: inline-block; - width: 33.333333%; - border: 1rpx solid #f8f8f8; - box-sizing: border-box; - text-align: center; - line-height: 85rpx; -} - -.navbar-item-on { - background-color: #e01222; - border-radius: 6rpx; -} - -.point-box { - width: 100%; - font-size: 28rpx; - padding: 20rpx 0; - border-bottom: 1rpx solid #f8f8f8; - padding-left: 5rpx; -} - -.point-item { - display: inline-block; - width: 33.333333%; - word-break: keep-all; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.point-box .price { - color: #e01222; - text-align: center; -} - -.point-box .time { - color: #999999; -} - -.point-box .title { - text-align: center; -} \ No newline at end of file diff --git a/pages/user/recharge_list/recharge_list.js b/pages/user/recharge_list/recharge_list.js deleted file mode 100644 index 5b85415..0000000 --- a/pages/user/recharge_list/recharge_list.js +++ /dev/null @@ -1,32 +0,0 @@ -var e = function(e) { - return e && e.__esModule ? e : { - default: e - }; -}(require("../../../utils/LoadMore.js")), t = getApp(), r = new e.default(), a = require("../../../utils/util.js"); - -Page({ - data: { - url: t.globalData.setting.url, - resourceUrl: t.globalData.setting.resourceUrl, - iurl: t.globalData.setting.imghost, - recharges: null, - currentPage: 1 - }, - onLoad: function() { - r.init(this, "", "recharges"), this.requestChangeList(); - }, - requestChangeList: function() { - var e = this, t = "/api/user/recharge_list/?p=" + e.data.currentPage; - r.request(t, function(t) { - e.data.currentPage++, t.data.result.forEach(function(e, t, r) { - e.cTimeFommat = a.format(e.ctime, "yyyy-MM-dd"); - }), wx.stopPullDownRefresh(); - }); - }, - onReachBottom: function() { - r.canloadMore() && this.requestChangeList(); - }, - onPullDownRefresh: function() { - this.data.recharges = null, this.data.currentPage = 1, r.resetConfig(), this.requestChangeList(); - } -}); \ No newline at end of file diff --git a/pages/user/recharge_list/recharge_list.json b/pages/user/recharge_list/recharge_list.json deleted file mode 100644 index d87067c..0000000 --- a/pages/user/recharge_list/recharge_list.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "充值记录" -} \ No newline at end of file diff --git a/pages/user/recharge_list/recharge_list.wxml b/pages/user/recharge_list/recharge_list.wxml deleted file mode 100644 index a335ac2..0000000 --- a/pages/user/recharge_list/recharge_list.wxml +++ /dev/null @@ -1,14 +0,0 @@ - - - 支付方式 - 日期 - 金额 - 状态 - - - {{item.pay_name?item.pay_name:''}} - {{item.cTimeFommat}} - {{item.account}} - {{item.pay_status==0?'待支付':''}}{{item.pay_status==1?'已支付':''}}{{item.pay_status==2?'支付失败':''}} - - diff --git a/pages/user/recharge_list/recharge_list.wxss b/pages/user/recharge_list/recharge_list.wxss deleted file mode 100644 index 81addc1..0000000 --- a/pages/user/recharge_list/recharge_list.wxss +++ /dev/null @@ -1,42 +0,0 @@ -page { - background-color: white; -} - -.recharge-box { - font-size: 28rpx; - padding: 25rpx 30rpx; - border-bottom: 1rpx solid #f8f8f8; -} - -.recharge-item { - display: inline-block; - word-break: keep-all; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - color: #666666; - box-sizing: border-box; - text-align: center; -} - -.recharge-box .pay { - width: 35%; -} - -.recharge-box .time { - width: 23%; -} - -.recharge-box .price { - width: 20%; -} - -.recharge-box .status { - width: 22%; - color: #e01222; -} - -.recharge-box .title { - color: #666666; - font-size: 32rpx; -} \ No newline at end of file diff --git a/pages/user/userinfo_edit/userinfo_edit.js b/pages/user/userinfo_edit/userinfo_edit.js deleted file mode 100644 index 4745246..0000000 --- a/pages/user/userinfo_edit/userinfo_edit.js +++ /dev/null @@ -1,107 +0,0 @@ -var e = getApp(), s = e.globalData.setting, a = e.request, i = require("../../../utils/md5.js"), t = require("../../../utils/common.js"); - -Page({ - data: { - url: s.url, - resourceUrl: s.resourceUrl, - user: null, - type: "", - canGetCode: !1 - }, - onLoad: function(s) { - var a = this; - this.setBarTitle(s.type), e.getUserInfo(function(e) { - a.setData({ - user: e, - type: s.type - }); - }); - }, - setBarTitle: function(e) { - var s = "修改个人信息"; - "nickname" == e ? s = "修改昵称" : "mobile" == e ? s = "修改手机" : "email" == e ? s = "修改邮箱" : "password" == e ? s = "修改密码" : "paypwd" == e ? s = "修改支付密码" : "sex" == e && (s = "修改性别"), - wx.setNavigationBarTitle({ - title: s - }); - }, - formSubmit: function(s) { - var a = this.data.type; - if (a) { - var i = s.detail.value; - "nickname" == a ? this.submitNickname(i) : "mobile" == a ? this.submitMobile(i) : "email" == a ? this.submitEmail(i) : "password" == a ? this.submitPassword(i) : "paypwd" == a ? this.submitPaypwd(i) : "sex" == a ? this.submitSex(i) : e.confirmBox("处理类型出错:" + a); - } - }, - submitNickname: function(s) { - if (!s.nickname) return e.showWarning("请输入昵称"), !1; - this.requestUpdateUser({ - nickname: s.nickname - }); - }, - submitMobile: function(s) { - return s.mobile ? s.mobile_code ? void this.requestUpdateUser({ - mobile: s.mobile, - mobile_code: s.mobile_code - }) : (e.showWarning("请输入验证码"), !1) : (e.showWarning("请输入手机号"), !1); - }, - submitEmail: function(s) { - return s.email ? s.email.indexOf("@") < 0 ? (e.showWarning("邮箱格式不正确"), !1) : void this.requestUpdateUser({ - email: s.email - }) : (e.showWarning("请输入邮箱"), !1); - }, - submitPassword: function(s) { - return this.data.user.password && !s.old_password ? (e.showWarning("请输入旧密码"), !1) : s.new_password ? s.confirm_password ? s.new_password.length < 6 || s.new_password.length > 18 ? (e.showWarning("密码长度不合法"), - !1) : s.new_password !== s.confirm_password ? (e.showWarning("两次密码不一致"), !1) : void a.post("/api/user/password", { - data: { - old_password: i("TPSHOP" + s.old_password), - new_password: i("TPSHOP" + s.new_password) - }, - success: function(s) { - e.showSuccess("修改成功", function() { - wx.navigateBack(); - }); - } - }) : (e.showWarning("请输入确认密码"), !1) : (e.showWarning("请输入新密码"), !1); - }, - submitPaypwd: function(s) { - return s.paypwd_mobile ? s.paypwd_code ? s.paypwd ? s.paypwd_confirm ? s.paypwd.length < 6 || s.paypwd.length > 18 ? (e.showWarning("密码长度不合法"), - !1) : s.paypwd !== s.paypwd_confirm ? (e.showWarning("两次密码不一致"), !1) : void a.post("/api/user/paypwd", { - data: { - new_password: i("TPSHOP" + s.paypwd), - mobile: s.paypwd_mobile, - paypwd_code: s.paypwd_code - }, - success: function(s) { - e.showSuccess("修改成功", function() { - wx.navigateBack(); - }); - } - }) : (e.showWarning("请输入确认密码"), !1) : (e.showWarning("请输入新密码"), !1) : (e.showWarning("请输入验证码"), - !1) : (e.showWarning("请输入手机号"), !1); - }, - submitSex: function(s) { - if (0 == this.data.user.sex) return e.showWarning("请选择性别"), !1; - this.requestUpdateUser({ - sex: this.data.user.sex - }); - }, - changeGender: function(e) { - var s = "boy" == e.currentTarget.dataset.gender ? 1 : 2; - this.setData({ - "user.sex": s - }); - }, - requestUpdateUser: function(e) { - a.post("/api/user/updateUserInfo", { - data: e, - success: function(e) { - wx.navigateBack(); - } - }); - }, - setMobile: function(e) { - this.data.user.mobile = e.detail.value; - }, - getCode: function(e) { - t.sendSmsCode(this.data.user.mobile); - } -}); \ No newline at end of file diff --git a/pages/user/userinfo_edit/userinfo_edit.json b/pages/user/userinfo_edit/userinfo_edit.json deleted file mode 100644 index af3b33f..0000000 --- a/pages/user/userinfo_edit/userinfo_edit.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "修改个人资料", - "enablePullDownRefresh": false -} \ No newline at end of file diff --git a/pages/user/userinfo_edit/userinfo_edit.wxml b/pages/user/userinfo_edit/userinfo_edit.wxml deleted file mode 100644 index 86cc5ff..0000000 --- a/pages/user/userinfo_edit/userinfo_edit.wxml +++ /dev/null @@ -1,63 +0,0 @@ -
- - - 昵称 - - - - - 手机号 - - - - - - - - - 邮箱 - - - - - 旧密码 - - - - 新密码 - - - - 确认密码 - - - - - - 手机号 - - - - - - - - 新密码 - - - - 确认密码 - - - - - - - - - - - - - -
diff --git a/pages/user/userinfo_edit/userinfo_edit.wxss b/pages/user/userinfo_edit/userinfo_edit.wxss deleted file mode 100644 index d82ce12..0000000 --- a/pages/user/userinfo_edit/userinfo_edit.wxss +++ /dev/null @@ -1,108 +0,0 @@ -page { - background-color: white; -} - -.user-container { - padding-top: 100rpx; -} - -.label-input { - font-size: 28rpx; - width: 680rpx; - margin: 0 35rpx; - line-height: 90rpx; - border: 1rpx #ddd solid; - border-radius: 10rpx; -} - -.label { - box-sizing: border-box; - float: left; - padding: 0 25rpx; -} - -.input { - box-sizing: border-box; - float: left; - height: 90rpx; - width: 500rpx; - padding-right: 5rpx; -} - -.simple { - border: 0; - border-radius: 0; - border-bottom: 1rpx #ddd solid; -} - -.submit { - width: 600rpx; - margin: 0 75rpx; - background-color: #e30000; - color: white; - line-height: 90rpx; - border-radius: 10rpx; -} - -.verify-box { - font-size: 28rpx; - width: 680rpx; - margin: 0 35rpx; - line-height: 90rpx; -} - -.verify-input { - box-sizing: border-box; - float: left; - height: 90rpx; - width: 400rpx; - padding-left: 10rpx; -} - -.verify-btn { - box-sizing: border-box; - float: right; - line-height: 90rpx; - padding: 0 10rpx; - background-color: #ec5151; - color: white; - border-radius: 10rpx; -} - -.btn-disable { - background-color: grey; -} - -.item { - margin-bottom: 70rpx; -} - -.gender-box { - width: 50%; - float: left; - padding: 100rpx 0 200rpx 0; -} - -.gender { - background-repeat: no-repeat!important; - background-size: 4.48rem!important; - width: 2.13333rem; - height: 2.73067rem; - margin: 0 auto; -} - -.boy { - background-position: 0 0!important; -} - -.girl { - background-position: 0 -2.92267rem!important; -} - -.boy-click { - background-position: -2.34667rem 0!important; -} - -.girl-click { - background-position: -2.368rem -2.92267rem!important; -} \ No newline at end of file diff --git a/pages/user/visit_log/visit_log.js b/pages/user/visit_log/visit_log.js deleted file mode 100644 index 994611e..0000000 --- a/pages/user/visit_log/visit_log.js +++ /dev/null @@ -1,48 +0,0 @@ -var t = function(t) { - return t && t.__esModule ? t : { - default: t - }; -}(require("../../../utils/LoadMore.js")), i = getApp(), e = i.request, s = new t.default(); - -Page({ - data: { - url: i.globalData.setting.url, - resourceUrl: i.globalData.setting.resourceUrl, - visits: null, - currentPage: 1 - }, - onLoad: function() { - s.init(this, "", "visits"), this.requestVisitLog(); - }, - onShow: function() { - this.resetData(), this.requestVisitLog(); - }, - onPullDownRefresh: function() { - this.resetData(), this.requestVisitLog(); - }, - onReachBottom: function() { - s.canloadMore() && this.requestVisitLog(); - }, - requestVisitLog: function() { - var t = this, i = t.data.url + "/api/user/visit_log?p=" + t.data.currentPage; - s.request(i, function(i) { - t.data.currentPage++, wx.stopPullDownRefresh(); - }); - }, - resetData: function() { - this.data.currentPage = 1, this.data.visits = null, s.resetConfig(); - }, - deleteVisit: function(t) { - var i = this, s = t.currentTarget.dataset.vidx, a = t.currentTarget.dataset.gidx, r = i.data.visits; - e.post("/api/user/del_visit_log", { - data: { - visit_ids: r[s].visit[a].visit_id - }, - success: function(t) { - 1 == r[s].visit.length ? r.splice(s, 1) : r[s].visit.splice(a, 1), i.setData({ - visits: r - }); - } - }); - } -}); \ No newline at end of file diff --git a/pages/user/visit_log/visit_log.json b/pages/user/visit_log/visit_log.json deleted file mode 100644 index 0ca1b3a..0000000 --- a/pages/user/visit_log/visit_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "访问记录" -} \ No newline at end of file diff --git a/pages/user/visit_log/visit_log.wxml b/pages/user/visit_log/visit_log.wxml deleted file mode 100644 index 139074c..0000000 --- a/pages/user/visit_log/visit_log.wxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - {{visit.date}} - - - - - - - - {{item.goods_name}} - - - ￥{{item.shop_price}} - 看相似 - 删除 - - - - - diff --git a/pages/user/visit_log/visit_log.wxss b/pages/user/visit_log/visit_log.wxss deleted file mode 100644 index 65d3f56..0000000 --- a/pages/user/visit_log/visit_log.wxss +++ /dev/null @@ -1,53 +0,0 @@ -.log_date { - background-color: #fff; - font-size: 28rpx; - color: #666666; - padding: 28rpx 28rpx; - border-bottom: 1rpx solid #e3e5e9; -} - -.visit { - background-color: #fff; - font-size: 28rpx; - padding: 10rpx 25rpx; -} - -.goods_img { - width: 200rpx; - height: 200rpx; - float: left; -} - -.goods_detail { - padding: 25rpx 0 25rpx 15rpx; - width: 485rpx; - float: left; - border-bottom: 1rpx #e3e5e9 solid; -} - -.goods_name { - height: 64rpx; - line-height: 32rpx; - margin-bottom: 34rpx; - overflow: hidden; -} - -.goods_footer { - height: 50rpx; -} - -.price { - color: red; - float: left; - margin-top: 6rpx; -} - -.similar { - font-size: 26rpx; - color: #777777; - float: right; - padding: 6rpx; - border: 1rpx #bfbfbf solid; - border-radius: 4rpx; - margin-left: 10rpx; -} \ No newline at end of file -- libgit2 0.21.4