积分，优惠券，预存存，余额转在D分包

WXD-SEASON\season
1 parent 87741355
Showing 69 changed files with 63 additions and 58 deletions
app.json
packageA/pages/checkin/checkin.wxml
packageA/pages/quan_list/quan_list.js
packageA/pages/quan_pro/quan_pro.js
packageB/pages/luckactivity/luckinfo/luckinfo.js
pages/user/coupons/coupons.js → packageD/pages/user/coupons/coupons.js
pages/user/coupons/coupons.json → packageD/pages/user/coupons/coupons.json
pages/user/coupons/coupons.wxml → packageD/pages/user/coupons/coupons.wxml
pages/user/coupons/coupons.wxss → packageD/pages/user/coupons/coupons.wxss
pages/user/coupons/filter.wxs → packageD/pages/user/coupons/filter.wxs
pages/user/deposit/deposit.js → packageD/pages/user/deposit/deposit.js
pages/user/deposit/deposit.json → packageD/pages/user/deposit/deposit.json
pages/user/deposit/deposit.wxml → packageD/pages/user/deposit/deposit.wxml
pages/user/deposit/deposit.wxss → packageD/pages/user/deposit/deposit.wxss
pages/user/deposit/prepaid/fil.wxs → packageD/pages/user/deposit/prepaid/fil.wxs
pages/user/deposit/prepaid/msg/msg.js → packageD/pages/user/deposit/prepaid/msg/msg.js
pages/user/deposit/prepaid/msg/msg.json → packageD/pages/user/deposit/prepaid/msg/msg.json
pages/user/deposit/prepaid/msg/msg.wxml → packageD/pages/user/deposit/prepaid/msg/msg.wxml
pages/user/deposit/prepaid/msg/msg.wxss → packageD/pages/user/deposit/prepaid/msg/msg.wxss
pages/user/deposit/prepaid/prepaid.js → packageD/pages/user/deposit/prepaid/prepaid.js
@@ -31,16 +31,9 @@
         "pages/team/team_ping/team_ping",
         "pages/cart/cart2_pt/cart2_pt",
         "pages/cart/cart_wk/cart_wk",
-        "pages/user/member/menber",
-        "pages/user/member/bring/bring",
-        "pages/user/member/bring/msg/msg",
-        "pages/user/member/account/account",
-        "pages/user/member/account_unable/account_unable",
-        "pages/user/member/cash_record/cash_record",
-        "pages/user/coupons/coupons",
-        "pages/user/integral/integral",
-        "pages/user/integral/query/index",
-        "pages/user/integral/msg/msg",
+       
+        
+   
         "pages/user/userqy/userqy",
         "pages/user/user_spsy/user_spsy",
         "pages/user/user_fw/user_fw",
@@ -74,9 +67,7 @@
         "pages/cart/cart2_inte/cart2_inte",
         "pages/giftpack/festival/festival",
         "pages/team/team_more/team_more",
-        "pages/user/deposit/deposit",
-        "pages/user/deposit/prepaid/msg/msg",
-        "pages/user/deposit/prepaid/prepaid",
+    
         "pages/distribution/distribution",
         "pages/template/index"
     ],
@@ -189,7 +180,21 @@
                 "pages/AI-test-skin/select_photo/select_photo",
                 "pages/AI-test-skin/fail_result/fail_result",
                 "pages/AI-test-skin/success_result/success_result",
-                "pages/AI-test-skin/analyse/analyse"
+                "pages/AI-test-skin/analyse/analyse",
+
+                "pages/user/coupons/coupons",
+                "pages/user/integral/integral",
+                "pages/user/integral/query/index",
+                "pages/user/integral/msg/msg",
+                "pages/user/deposit/deposit",
+                "pages/user/deposit/prepaid/msg/msg",
+                "pages/user/deposit/prepaid/prepaid",
+                "pages/user/member/menber",
+                "pages/user/member/bring/bring",
+                "pages/user/member/bring/msg/msg",
+                "pages/user/member/account/account",
+                "pages/user/member/account_unable/account_unable",
+                "pages/user/member/cash_record/cash_record"
             ]
         }
  
@@ -4,7 +4,7 @@
 <view class="checkin-container">
 	<view class="rule-container flex">
 		<view class="rule" bindtap="showRules">规则</view>
-		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral">
+		<view class="points" bindtap="goto" data-url="/packageD/pages/user/integral/integral">
 			<image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分
 		</view>
 	</view>
@@ -148,7 +148,7 @@ Page({
       this.setData({show_success:0,get_item:null})
   },
   go_quan:function () {
-     getApp().goto("/pages/user/coupons/coupons");
+     getApp().goto("/packageD/pages/user/coupons/coupons");
   },
   go_detail:function (e) {
       var index=e.currentTarget.dataset.ind;
@@ -132,7 +132,7 @@ Page({
    this.setData({
     show_success:0
   })
-	 getApp().goto("/pages/user/coupons/coupons");  
+	 getApp().goto("/packageD/pages/user/coupons/coupons");  
   },
  
   close_show(){
@@ -1279,7 +1279,7 @@ Page({
 		};
 		switch(type) {
 			case 1: {
-				url = '/pages/user/integral/integral';
+				url = '/packageD/pages/user/integral/integral';
 				break;
 			};
 			case 2: {
@@ -1287,7 +1287,7 @@ Page({
 				break;
 			};
 			case 3: {
-				url = '/pages/user/coupons/coupons';
+				url = '/packageD/pages/user/coupons/coupons';
 				break;
 			};
 			case 4: {
@@ -2,14 +2,14 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../utils/util.js"),
+  i = require("../../../../utils/util.js"),
   ut = i,
-  s = require("../../../utils/common.js");
-var regeneratorRuntime = require('../../../utils/runtime.js');
+  s = require("../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 const {
   barcode,
   qrcode
-} = require('../../../utils/index.js');
+} = require('../../../../utils/index.js');
 let _this = null;
  
 Page({
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../utils/util.js"),
+  i = require("../../../../utils/util.js"),
   ut = i,
-  s = require("../../../utils/common.js");
-var regeneratorRuntime = require('../../../utils/runtime.js');
+  s = require("../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 Page({
   data:{
     yucun_money:0,
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
       data: {
         iurl: o.imghost,
@@ -3,9 +3,9 @@ var e = function (e) {
   return e && e.__esModule ? e : {
     default: e
   };
-}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
-  i = require("../../../utils/util.js"), ut = i, b = require("../../../app.js"), app = b, s = require("../../../utils/common.js"), n = new e.default();
-var regeneratorRuntime = require('../../../utils/runtime.js');
+}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
+  i = require("../../../../utils/util.js"), ut = i, b = require("../../../../app.js"), app = b, s = require("../../../../utils/common.js"), n = new e.default();
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 Page({
  
   /**
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
  
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
     details:[],//数据
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
     details: [],//数据
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 var oo = t.globalData.setting;
 Page({
   /**
@@ -2,10 +2,10 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o,
-  i = require("../../../../utils/util.js"),
+  i = require("../../../../../utils/util.js"),
   ut = i,
-  s = require("../../../../utils/common.js");
-var regeneratorRuntime = require('../../../../utils/runtime.js');
+  s = require("../../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../../utils/runtime.js');
 Page({
   data: {
     parameter: false,//控制有没有数据的时候
@@ -2,9 +2,9 @@ var e = function (e) {
   return e && e.__esModule ? e : {
     default: e
   };
-}(require("../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
-  i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default();
-var regeneratorRuntime = require('../../../utils/runtime.js');
+}(require("../../../../utils/LoadMore.js")), t = getApp(), a = t.request, o = t.globalData.setting, os = o,
+  i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js"), n = new e.default();
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 Page({
   /**
    * 页面的初始数据
@@ -14,7 +14,7 @@
 	<view>
 		<view class="flex ai-center jc_sb pd2622 bdb arrow-r" bindtap="goto">
 			<view><text class="iconfont icon-jine pdr10 ctb"></text>可提现金额</view>
-			<view class="ctb money" data-url="/pages/user/member/menber">{{filter.show_default(data.liudong_money)}}</view>
+			<view class="ctb money" data-url="/packageD/pages/user/member/menber">{{filter.show_default(data.liudong_money)}}</view>
 		</view>
  
 		<view class="flex jc_sa t-c">
@@ -100,7 +100,7 @@
             </block>-->
  
             <block wx:if="{{isBuy==0&item.lbType==2}}">
-              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/packageD/pages/user/coupons/coupons" bindtap="goto"></image>
             </block>
             <block wx:if="{{isBuy==0&item.lbType==3}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
@@ -79,7 +79,7 @@
                 </block>
               </block>
               <block wx:if="{{item.lbType==2}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/packageD/pages/user/coupons/coupons" bindtap="goto"></image>
               </block>
               <block wx:if="{{item.lbType==3}}">
                 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
@@ -182,7 +182,7 @@ Page({
      var index=e.currentTarget.dataset.ind;
      switch (index) {
        case "0": getApp().goto("/pages/index/index/index");break;
-       case "1": getApp().goto("/pages/user/coupons/coupons"); break;
+       case "1": getApp().goto("/packageD/pages/user/coupons/coupons"); break;
        case "2": getApp().goto("/pages/user/userqy/userqy"); break;
      }
   },
@@ -529,14 +529,14 @@ Page({
   deposit: function() {
     if (!this.data.userInfo) return false;
     wx.navigateTo({
-      url: '../deposit/deposit',
+      url: '/packageD/pages/user/deposit/deposit',
     })
   },
   //--跳转到余额页面--
   balance: function() {
     if (!this.data.userInfo) return false;
     wx.navigateTo({
-      url: '../member/menber',
+      url: '/packageD/pages/user/member/menber',
     })
   },
   //--跳转到优惠券--
@@ -545,14 +545,14 @@ Page({
     if (!this.data.userInfo) return false;
     //  th.sendsm();
     wx.navigateTo({
-      url: '../coupons/coupons',
+      url: '/packageD/pages/user/coupons/coupons',
     })
   },
   //--跳转到积分--
   integral: function() {
     if (!this.data.userInfo) return false;
     wx.navigateTo({
-      url: '../integral/integral',
+      url: '/packageD/pages/user/integral/integral',
     })
   },
   //--跳到绑定页面--