diff --git a/application/service/AppMiniService.php b/application/service/AppMiniService.php index 5068880a9f28b55d820b41b1c2a70e2040c74505..ef3231a5a1584fc6ad1c6187815587b54b8b98ae 100755 --- a/application/service/AppMiniService.php +++ b/application/service/AppMiniService.php @@ -210,7 +210,7 @@ class AppMiniService if(is_array($data) && isset($data['plugins'])) { $data['plugins']['goodsSharePlugin'] = [ - 'version' => '3.2.0', + 'version' => '4.0.1', 'provider' => 'wx56c8f077de74b07c', ]; if(file_put_contents($file, JsonFormat($data)) === false) diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index ca5a8e449fcddc55d4bff7dd06fa799c7d29f625..77ee670da4ce830a7025857bc07eb30ef918027a 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -29,10 +29,10 @@ App({ // tabbar页面 tabbar_pages: [ - "index", - "goods-category", - "cart", - "user", + "/pages/index/index", + "/pages/goods-category/goods-category", + "/pages/cart/cart", + "/pages/user/user", ], // 页面标题 @@ -65,6 +65,7 @@ App({ "extraction_address": "自提地址", "membervip": "会员VIP", "membervip_buy": "开通时长", + "membervip_order": "开通订单", }, // 请求地址 @@ -463,12 +464,12 @@ App({ is_tabbar_pages(url) { if (url.indexOf("?") == -1) { - var all = url.split("/"); + var value = url; } else { var temp_str = url.split("?"); - var all = temp_str[0].split("/"); + var value = temp_str[0]; } - if (all.length <= 0) + if ((value || null) == null) { return false; } @@ -476,7 +477,7 @@ App({ var temp_tabbar_pages = this.data.tabbar_pages; for (var i in temp_tabbar_pages) { - if (temp_tabbar_pages[i] == all[all.length-1]) + if (temp_tabbar_pages[i] == value) { return true; } diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index cb59c62223f8a8ae1bc9da305b6d3964ef7f7010..9cf18dae1cef2e339bc32566a777a9798fcba861 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -1,6 +1,6 @@ { "pages": [ - "pages/user-membervip/user-membervip", + "pages/plugins/membershiplevelvip/order/order", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -27,11 +27,12 @@ "pages/user-goods-browse/user-goods-browse", "pages/user-orderaftersale/user-orderaftersale", "pages/user-orderaftersale-detail/user-orderaftersale-detail", - "pages/coupon/coupon", - "pages/user-coupon/user-coupon", "pages/extraction-address/extraction-address", - "pages/membervip/membervip", - "pages/membervip-buy/membervip-buy" + "pages/plugins/coupon/index/index", + "pages/plugins/coupon/user/user", + "pages/plugins/membershiplevelvip/index/index", + "pages/plugins/membershiplevelvip/buy/buy", + "pages/plugins/membershiplevelvip/user/user" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-order-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-order-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c48293ce441b6dd657b8ce77e86834dfed9ecd94 Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-order-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouyi-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouyi-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6788d53ba4e7abb1893c0abf3a04a383b963c38c Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouyi-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dd44721f0eeaab69578f603656db6a123ce8cc99 Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c715dd9c44bc2214a43298f6ba1dd9c3acf61e Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png differ diff --git a/public/appmini/old/weixin/pages/coupon/coupon.js b/public/appmini/old/weixin/pages/plugins/coupon/index/index.js similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.js rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.js diff --git a/public/appmini/old/weixin/pages/coupon/coupon.json b/public/appmini/old/weixin/pages/plugins/coupon/index/index.json similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.json rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.json diff --git a/public/appmini/old/weixin/pages/coupon/coupon.wxml b/public/appmini/old/weixin/pages/plugins/coupon/index/index.wxml similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.wxml rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.wxml diff --git a/public/appmini/old/weixin/pages/coupon/coupon.wxss b/public/appmini/old/weixin/pages/plugins/coupon/index/index.wxss similarity index 100% rename from public/appmini/old/weixin/pages/coupon/coupon.wxss rename to public/appmini/old/weixin/pages/plugins/coupon/index/index.wxss diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js b/public/appmini/old/weixin/pages/plugins/coupon/user/user.js similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.js rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.js diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.json b/public/appmini/old/weixin/pages/plugins/coupon/user/user.json similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.json rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.json diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml b/public/appmini/old/weixin/pages/plugins/coupon/user/user.wxml similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.wxml diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss b/public/appmini/old/weixin/pages/plugins/coupon/user/user.wxss similarity index 100% rename from public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss rename to public/appmini/old/weixin/pages/plugins/coupon/user/user.wxss diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js similarity index 98% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js index 66f88862479f021090b3bbdf765b185643ae15a1..3d7511ddd807d2d91a14335cc4d487ae520847dd 100644 --- a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.js @@ -133,7 +133,7 @@ Page({ if (res.data.code == 0) { // 进入以后会员中心并发起支付 wx.redirectTo({ - url: '/pages/user-membervip/user-membervip', + url: '/pages/plugins/membershiplevelvip/user/user', }); } else { if (app.is_login_check(res.data, self, 'submit_event')) { diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json similarity index 100% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.json diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml similarity index 100% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxml diff --git a/public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxss similarity index 100% rename from public/appmini/old/weixin/pages/membervip-buy/membervip-buy.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/buy/buy.wxss diff --git a/public/appmini/old/weixin/pages/membervip/membervip.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js similarity index 100% rename from public/appmini/old/weixin/pages/membervip/membervip.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.js diff --git a/public/appmini/old/weixin/pages/membervip/membervip.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json similarity index 100% rename from public/appmini/old/weixin/pages/membervip/membervip.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.json diff --git a/public/appmini/old/weixin/pages/membervip/membervip.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxml similarity index 93% rename from public/appmini/old/weixin/pages/membervip/membervip.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxml index 0028c1225ad3f0b998d724a3709326fe8129bf5b..e0894f6930e19bda12e9cc7b79cc36b1dab76c3c 100644 --- a/public/appmini/old/weixin/pages/membervip/membervip.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxml @@ -4,7 +4,7 @@ {{data_base.banner_top_title}} - + diff --git a/public/appmini/old/weixin/pages/membervip/membervip.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxss similarity index 100% rename from public/appmini/old/weixin/pages/membervip/membervip.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/index/index.wxss diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js new file mode 100644 index 0000000000000000000000000000000000000000..2e4acb5397f048cf48ced65242e5fe97b7d9fcfb --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.js @@ -0,0 +1,410 @@ +const app = getApp(); +Page({ + data: { + data_list: [], + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + params: null, + load_status: 0, + is_show_payment_popup: false, + payment_list: [], + payment_id: 0, + temp_pay_value: 0, + temp_pay_index: 0, + nav_status_list: [ + { name: "全部", value: "-1" }, + { name: "待支付", value: "0" }, + { name: "已支付", value: "1" }, + { name: "已取消", value: "2" }, + { name: "已关闭", value: "3" }, + ], + nav_status_index: 0, + }, + + onLoad(params) { + // 是否指定状态 + var nav_status_index = 0; + if ((params.status || null) != null) { + for (var i in this.data.nav_status_list) { + if (this.data.nav_status_list[i]['value'] == params.status) { + nav_status_index = i; + break; + } + } + } + + this.setData({ + params: params, + nav_status_index: nav_status_index, + }); + this.init(); + }, + + onShow() { + wx.setNavigationBarTitle({ title: app.data.common_pages_title.membervip_order }); + }, + + init() { + var user = app.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.redirectTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + + // 获取数据 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data.data_bottom_line_status == true) { + return false; + } + } + + // 加载loding + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + // 参数 + var order_status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value']; + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "order", "membershiplevelvip"), + method: "POST", + data: { + page: this.data.data_page, + status: order_status, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + if (res.data.data.data.length > 0) { + if (this.data.data_page <= 1) { + var temp_data_list = res.data.data.data; + + // 下订单支付处理 + if (this.data.load_status == 0) { + if ((this.data.params.is_pay || 0) == 1 && (this.data.params.order_id || 0) != 0) { + for (var i in temp_data_list) { + if (this.data.params.order_id == temp_data_list[i]['id']) { + this.pay_handle(this.data.params.order_id, i); + break; + } + } + } + } + } else { + var temp_data_list = this.data.data_list; + var temp_data = res.data.data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: res.data.data.total, + data_page_total: res.data.data.page_total, + data_list_loding_status: 3, + data_page: this.data.data_page + 1, + load_status: 1, + payment_list: res.data.data.payment_list || [], + }); + + // 是否还有数据 + if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) { + this.setData({ data_bottom_line_status: true }); + } else { + this.setData({ data_bottom_line_status: false }); + } + } else { + this.setData({ + data_list_loding_status: 0, + load_status: 1, + data_list: [], + data_bottom_line_status: false, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + load_status: 1, + }); + if (app.is_login_check(res.data, this, 'get_data_list')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + + this.setData({ + data_list_loding_status: 2, + load_status: 1, + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.setData({ + data_page: 1 + }); + this.get_data_list(1); + }, + + // 滚动加载 + scroll_lower(e) { + this.get_data_list(); + }, + + // 支付 + pay_event(e) { + this.setData({ + is_show_payment_popup: true, + temp_pay_value: e.currentTarget.dataset.value, + temp_pay_index: e.currentTarget.dataset.index, + }); + }, + + // 支付弹窗关闭 + payment_popup_event_close(e) { + this.setData({ is_show_payment_popup: false }); + }, + + // 支付弹窗发起支付 + popup_payment_event(e) { + var payment_id = e.currentTarget.dataset.value || 0; + this.setData({ payment_id: payment_id }); + this.payment_popup_event_close(); + this.pay_handle(this.data.temp_pay_value, this.data.temp_pay_index); + }, + + // 支付方法 + pay_handle(order_id, index) { + var self = this; + // 加载loding + wx.showLoading({ title: "请求中..." }); + + wx.request({ + url: app.get_request_url("pay", "order"), + method: "POST", + data: { + id: order_id, + payment_id: this.data.payment_id, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + // 是否在线支付,非在线支付则支付成功 + if (res.data.data.is_online_pay == 0) { + // 数据设置 + self.order_item_pay_success_handle(index); + + app.showToast("支付成功", "success"); + } else { + wx.requestPayment({ + timeStamp: res.data.data.data.timeStamp, + nonceStr: res.data.data.data.nonceStr, + package: res.data.data.data.package, + signType: res.data.data.data.signType, + paySign: res.data.data.data.paySign, + success: function (res) { + // 数据设置 + self.order_item_pay_success_handle(index); + + // 跳转支付页面 + wx.navigateTo({ + url: "/pages/paytips/paytips?code=9000&total_price=" + + self.data.data_list[index]['total_price'] + }); + }, + fail: function (res) { + app.showToast('支付失败'); + } + }); + } + } else { + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + }, + + // 支付成功数据设置 + order_item_pay_success_handle(index) { + // 数据设置 + var temp_data_list = this.data.data_list; + switch (parseInt(temp_data_list[index]['order_model'])) { + // 销售模式 + case 0: + temp_data_list[index]['status'] = 2; + temp_data_list[index]['status_name'] = '待发货'; + break; + + // 自提模式 + case 2: + temp_data_list[index]['status'] = 2; + temp_data_list[index]['status_name'] = '待取货'; + break; + + // 虚拟模式 + case 3: + temp_data_list[index]['status'] = 3; + temp_data_list[index]['status_name'] = '待收货'; + break; + } + this.setData({ data_list: temp_data_list }); + }, + + // 取消 + cancel_event(e) { + wx.showModal({ + title: "温馨提示", + content: "取消后不可恢复,确定继续吗?", + confirmText: "确认", + cancelText: "不了", + success: result => { + if (result.confirm) { + // 参数 + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; + + // 加载loding + wx.showLoading({ title: "处理中..." }); + + wx.request({ + url: app.get_request_url("cancel", "order"), + method: "POST", + data: { id: id }, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + var temp_data_list = this.data.data_list; + temp_data_list[index]['status'] = 5; + temp_data_list[index]['status_name'] = '已取消'; + this.setData({ data_list: temp_data_list }); + + app.showToast(res.data.msg, "success"); + } else { + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + } + } + }); + }, + + // 收货 + collect_event(e) { + wx.showModal({ + title: "温馨提示", + content: "请确认已收到货物或已完成,操作后不可恢复,确定继续吗?", + confirmText: "确认", + cancelText: "不了", + success: result => { + if (result.confirm) { + // 参数 + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; + + // 加载loding + wx.showLoading({ title: "处理中..." }); + + wx.request({ + url: app.get_request_url("collect", "order"), + method: "POST", + data: { id: id }, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + var temp_data_list = this.data.data_list; + temp_data_list[index]['status'] = 4; + temp_data_list[index]['status_name'] = '已完成'; + this.setData({ data_list: temp_data_list }); + + app.showToast(res.data.msg, "success"); + } else { + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + } + } + }); + }, + + // 催催 + rush_event(e) { + app.showToast("催促成功", "success"); + }, + + // 导航事件 + nav_event(e) { + this.setData({ + nav_status_index: e.currentTarget.dataset.index || 0, + data_page: 1, + }); + this.get_data_list(1); + }, + + // 售后订单事件 + orderaftersale_event(e) { + var oid = e.currentTarget.dataset.oid || 0; + var did = e.currentTarget.dataset.did || 0; + if (oid == 0 || did == 0) { + app.showToast("参数有误"); + return false; + } + + // 进入售后页面 + wx.navigateTo({ + url: "/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=" + oid + "&did=" + did + }); + }, + + // 订单评论 + comments_event(e) { + wx.navigateTo({ + url: "/pages/user-order-comments/user-order-comments?id=" + e.currentTarget.dataset.value + }); + }, +}); diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json new file mode 100644 index 0000000000000000000000000000000000000000..7d179bfd5fd5f445a1ef926625a70f5712237393 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.json @@ -0,0 +1,6 @@ +{ + "enablePullDownRefresh": true, + "usingComponents": { + "component-popup": "/components/popup/popup" + } +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml new file mode 100644 index 0000000000000000000000000000000000000000..c7b81c87d856478cf32a8dd93eeff9a65ebf690d --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxml @@ -0,0 +1,74 @@ + + + + {{item.name}} + {{item.name}} + + + + + + + + + {{item.add_time_time}} + {{item.status_name}} + + + + + 开通单号 + {{item.payment_user_order_no}} + + + 开通时长 + {{item.period_value}} + {{item.period_unit}} + + + 订单金额 + {{item.price}} + + + + 支付金额 + {{item.pay_price}} + + + + 结算状态: + {{item.settlement_status_name}} + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.name}} + + + + + 没有支付方式 + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss new file mode 100644 index 0000000000000000000000000000000000000000..b394cac6ab76e5b10f6e41f122809762a757d36f --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/order/order.wxss @@ -0,0 +1,60 @@ +/* + * 导航 + */ +.nav { + background: #eee; + height: 80rpx; + line-height: 80rpx; +} +.nav .item { + width: 20%; +} + +/* + * 列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list { + +} +.data-list .item .base, +.data-list .item .content { + padding: 20rpx 10rpx; +} +.data-list .item .content .multi-text { + line-height: 50rpx; +} +.data-list .item .content .multi-text .title { + margin-right: 20rpx; +} +.data-list .item .content .multi-text .value { + font-weight: 500; +} +.data-list .item .content .multi-text .unit { + margin-left: 10rpx; +} +.data-list .item .operation { + padding: 20rpx 10rpx; +} + +/** + * 支付方式 + */ +.payment-list { + padding: 40rpx 0; +} +.payment-list .item { + width: 50%; +} +.payment-list .item-content { + margin: 20rpx; + padding: 20rpx 10rpx; +} +.payment-list .item-content image { + width: 50rpx; + height: 50rpx !important; + vertical-align: middle; + margin-right: 10rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js similarity index 83% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js index 6972e4185665b433f95abba78acbb573a98fb45e..f7362d6bab51cea7f2eac030983569672d250843 100644 --- a/public/appmini/old/weixin/pages/user-membervip/user-membervip.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js @@ -9,22 +9,27 @@ Page({ avatar: app.data.default_user_head_src, nickname: "用户名", + // 导航 nav_list: [ { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-order-icon.png", title: "开通订单", + url: "/pages/plugins/membershiplevelvip/order/order", }, { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png", title: "推广返利", + url: "/pages/plugins/membershiplevelvip/tuiguang/tuiguang", }, { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-shouyi-icon.png", title: "收益明细", + url: "/pages/plugins/membershiplevelvip/shouyi/shouyi", }, { - icon: "/images/share-weixin-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-tongji-icon.png", title: "数据统计", + url: "/pages/plugins/membershiplevelvip/tongji/tongji", } ], }, diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json similarity index 100% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.json diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml similarity index 86% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml index f00b085a46466369788cdc0bda3c6ee4fa2d4d86..5e7a909efe954fa91ab47effa5e1bd108b5edc15 100644 --- a/public/appmini/old/weixin/pages/user-membervip/user-membervip.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxml @@ -15,7 +15,7 @@ 会员已过期或未开通 - + @@ -29,7 +29,7 @@ - + @@ -43,10 +43,12 @@ - - - {{item.title}} - + + + + {{item.title}} + + diff --git a/public/appmini/old/weixin/pages/user-membervip/user-membervip.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss similarity index 100% rename from public/appmini/old/weixin/pages/user-membervip/user-membervip.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss