wxd / MShopWeApp

Commit 4deff541be51e30db0e21524f3078a55fd51afe4

Authored by WXD-SEASON\season
1 parent 54967b4c

创建packageB

Inline Side-by-side
Showing 27 changed files with 51 additions and 38 deletions
app.json
  View file @4deff54
... ... @@ -19,8 +19,7 @@
19 19 "pages/user/coupon/coupon",
20 20 "pages/user/checkcoupon/checkcoupon",
21 21 "pages/user/add_address/add_address",
22   - "pages/user/withdrawals_list/withdrawals_list",
23   - "pages/user/add_comment/add_comment",
  22 + "pages/user/withdrawals_list/withdrawals_list",
24 23 "pages/user/return_goods_info/return_goods_info",
25 24 "pages/user/return_goods/return_goods",
26 25 "pages/user/withdrawals/withdrawals",
... ... @@ -50,8 +49,7 @@
50 49 "pages/user/integral/msg/msg",
51 50 "pages/user/userqy/userqy",
52 51 "pages/user/user_spsy/user_spsy",
53   - "pages/user/user_fw/user_fw",
54   - "pages/user/user_coupon/user_coupon",
  52 + "pages/user/user_fw/user_fw",
55 53 "pages/user/grow_value/grow_value",
56 54 "pages/payment/pay_success/pay_success",
57 55 "pages/user/plus/plus",
... ... @@ -66,10 +64,8 @@
66 64 "pages/user/my_service/tment_eval",
67 65 "pages/user/my_service/tment_order_list",
68 66 "pages/user/my_service/beauty_deta",
69   - "pages/user/labels/labels",
70   - "pages/user/view_comment/view_comment",
71   - "pages/giftpack/birthdaygift/birthdaygift",
72   - "pages/user/comment/comment",
  67 + "pages/user/labels/labels",
  68 + "pages/giftpack/birthdaygift/birthdaygift",
73 69 "pages/giftpack/evaluategift/evaluategift",
74 70 "pages/giftpack/newvipgift/newvipgift",
75 71 "pages/giftpack/payment/payment",
... ... @@ -88,7 +84,7 @@
88 84 "pages/cart/cart2_inte/cart2_inte",
89 85 "pages/giftpack/festival/festival",
90 86 "pages/team/team_more/team_more",
91   - "pages/user/collect_list/collect_list",
  87 +
92 88 "pages/user/deposit/deposit",
93 89 "pages/user/deposit/prepaid/msg/msg",
94 90 "pages/user/deposit/prepaid/prepaid",
... ... @@ -96,7 +92,7 @@
96 92 ],
97 93 "plugins": {
98 94 "live-player-plugin": {
99   - "version": "1.2.5",
  95 + "version": "1.3.0",
100 96 "provider": "wx2b03c6e691cd7370"
101 97 }
102 98 },
... ... @@ -141,10 +137,25 @@
141 137 "pages/my_service/tment_order_list",
142 138 "pages/my_service/beauty_deta",
143 139 "pages/profile/profile",
144   - "pages/parseHtml/parseHtml"
  140 + "pages/parseHtml/parseHtml"
  141 +
145 142 ]
146 143  
147   - }],
  144 + },
  145 + {
  146 + "root": "packageB/",
  147 + "name":"pack2",
  148 + "pages": [
  149 + "pages/user/collect_list/collect_list",
  150 + "pages/user/comment/comment",
  151 + "pages/user/view_comment/view_comment",
  152 + "pages/user/add_comment/add_comment",
  153 + "pages/user/user_coupon/user_coupon"
  154 + ]
  155 +
  156 +}
  157 +
  158 +],
148 159 "permission": {
149 160 "scope.userLocation": {
150 161 "desc": "获取你的位置信息"
... ...
pages/user/add_comment/add_comment.js renamed to packageB/pages/user/add_comment/add_comment.js
  View file @4deff54
pages/user/add_comment/add_comment.json renamed to packageB/pages/user/add_comment/add_comment.json
  View file @4deff54
pages/user/add_comment/add_comment.wxml renamed to packageB/pages/user/add_comment/add_comment.wxml
  View file @4deff54
... ... @@ -106,7 +106,7 @@
106 106 </view>
107 107  
108 108 <view class="Submission flex-level ">
109   - <view class="fs30 flex-level white " bindtap="submitComment" data-url="/pages/user/view_comment/view_comment?goods_id={{goods_id}}&order_id={{order_id}}">提交评价</view>
  109 + <view class="fs30 flex-level white " bindtap="submitComment" data-url="/packageB/pages/user/view_comment/view_comment?goods_id={{goods_id}}&order_id={{order_id}}">提交评价</view>
110 110 </view>
111 111 </view>
112 112  
... ...
pages/user/add_comment/add_comment.wxss renamed to packageB/pages/user/add_comment/add_comment.wxss
  View file @4deff54
pages/user/collect_list/collect_list.js renamed to packageB/pages/user/collect_list/collect_list.js
  View file @4deff54
... ... @@ -2,13 +2,13 @@ var t = function(t) {
2 2 return t && t.__esModule ? t : {
3 3 default: t
4 4 };
5   - }(require("../../../utils/LoadMore.js")),
  5 + }(require("../../../../utils/LoadMore.js")),
6 6 e = getApp(),
7 7 a = e.request,
8 8 o = new t.default();
9 9 var oo = e.globalData.setting,
10 10 app_d = e.globalData;
11   -var ut = require('../../../utils/util.js');
  11 +var ut = require('../../../../utils/util.js');
12 12  
13 13 Page({
14 14 data: {
... ... @@ -29,6 +29,7 @@ Page({
29 29 isdelete: 0
30 30 },
31 31 onLoad: function() {
  32 +
32 33 o.init(this, "", "collects"),
33 34 this.requestCollectList();
34 35 },
... ... @@ -50,8 +51,11 @@ Page({
50 51 is_goods: 1
51 52 })
52 53 var goods_list = th.selectComponent("#goods_recommend"); //组件的id
53   - goods_list.init();
54   - setTimeout(function () { goods_list.get_list(); }, 300)
  54 + if (goods_list)
  55 + {
  56 + goods_list.init();
  57 + setTimeout(function () { goods_list.get_list(); }, 300)
  58 + }
55 59 }
56 60 });
57 61 },
... ... @@ -130,9 +134,8 @@ Page({
130 134  
131 135  
132 136 goto: function(ee) {
133   - wx.navigateTo({
134   - url: '/pages/index/index/index',
135   - })
  137 + getApp().goto("/pages/index/index/index");
  138 +
136 139 },
137 140 //编辑商品显示
138 141 editcollects: function() {
... ...
pages/user/collect_list/collect_list.json renamed to packageB/pages/user/collect_list/collect_list.json
  View file @4deff54
pages/user/collect_list/collect_list.wxml renamed to packageB/pages/user/collect_list/collect_list.wxml
  View file @4deff54
pages/user/collect_list/collect_list.wxss renamed to packageB/pages/user/collect_list/collect_list.wxss
  View file @4deff54
pages/user/comment/comment.js renamed to packageB/pages/user/comment/comment.js
  View file @4deff54
1   -var ut = require("../../../utils/util.js");
  1 +var ut = require("../../../../utils/util.js");
2 2 var t = function(t) {
3 3 return t && t.__esModule ? t : {
4 4 default: t
5 5 };
6   - }(require("../../../utils/LoadMore.js")),
  6 + }(require("../../../../utils/LoadMore.js")),
7 7 e = getApp(),
8 8 rq = e.request,
9 9 a = new t.default(),
10   - s = require("../../../utils/util.js"),
  10 + s = require("../../../../utils/util.js"),
11 11 oo = e.globalData,
12 12 os = e.globalData.setting;
13   -var regeneratorRuntime = require('../../../utils/runtime.js');
  13 +var regeneratorRuntime = require('../../../../utils/runtime.js');
14 14  
15 15 Page({
16 16 data: {
... ... @@ -117,7 +117,7 @@ Page({
117 117 var n = "?order_id=" + a[s].order_id;
118 118 n += "&goods_id=" + a[s].goods_id, n += "&price=" + a[s].goods_price;
119 119 wx.navigateTo({
120   - url: "/pages/user/add_comment/add_comment" + n
  120 + url: "/packageB/pages/user/add_comment/add_comment" + n
121 121 });
122 122 }
123 123 },
... ...
pages/user/comment/comment.json renamed to packageB/pages/user/comment/comment.json
  View file @4deff54
pages/user/comment/comment.wxml renamed to packageB/pages/user/comment/comment.wxml
  View file @4deff54
... ... @@ -110,11 +110,11 @@
110 110 <view>查看订单</view>
111 111 </navigator>
112 112  
113   - <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/pages/user/view_comment/view_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}">
  113 + <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/view_comment/view_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}">
114 114 <view>查看评价</view>
115 115 </navigator>
116 116  
117   - <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="{{item.comment_id>0?'/pages/user/add_comment/add_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}':''}}">
  117 + <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="{{item.comment_id>0?'/packageB/pages/user/add_comment/add_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}':''}}">
118 118 <view class="fs24">去评价</view>
119 119 </navigator>
120 120 </view>
... ...
pages/user/comment/comment.wxss renamed to packageB/pages/user/comment/comment.wxss
  View file @4deff54
pages/user/user_coupon/c_filter.wxs renamed to packageB/pages/user/user_coupon/c_filter.wxs
  View file @4deff54
pages/user/user_coupon/filter.wxs renamed to packageB/pages/user/user_coupon/filter.wxs
  View file @4deff54
pages/user/user_coupon/user_coupon.js renamed to packageB/pages/user/user_coupon/user_coupon.js
  View file @4deff54
1   -// pages/user/user_coupon/user_coupon.js
2 1 var e = getApp(),os = e.globalData.setting;
3   -var utils = require('../../../utils/util.js');
4   -var regeneratorRuntime = require('../../../utils/runtime.js');
  2 +var utils = require('../../../../utils/util.js');
  3 +var regeneratorRuntime = require('../../../../utils/runtime.js');
5 4  
6 5 Page({
7 6 /**
... ...
pages/user/user_coupon/user_coupon.json renamed to packageB/pages/user/user_coupon/user_coupon.json
  View file @4deff54
pages/user/user_coupon/user_coupon.wxml renamed to packageB/pages/user/user_coupon/user_coupon.wxml
  View file @4deff54
pages/user/user_coupon/user_coupon.wxss renamed to packageB/pages/user/user_coupon/user_coupon.wxss
  View file @4deff54
pages/user/view_comment/view_comment.js renamed to packageB/pages/user/view_comment/view_comment.js
  View file @4deff54
1   -var i = require("../../../utils/util.js"),
  1 +var i = require("../../../../utils/util.js"),
2 2 ut = i;
3 3 var e = getApp(),
4 4 a = e.globalData.setting,
... ...
pages/user/view_comment/view_comment.json renamed to packageB/pages/user/view_comment/view_comment.json
  View file @4deff54
pages/user/view_comment/view_comment.wxml renamed to packageB/pages/user/view_comment/view_comment.wxml
  View file @4deff54
... ... @@ -93,7 +93,7 @@
93 93 <!-- 是否匿名评价 -->
94 94 <view class="Whether" wx:if="{{comment.length>0}}">
95 95 <view class="Submission flex-level ">
96   - <view class="fs30 flex-level white " bindtap="goto" data-url="/pages/user/comment/comment">评价其他</view>
  96 + <view class="fs30 flex-level white " bindtap="goto" data-url="/packageB/pages/user/comment/comment">评价其他</view>
97 97 </view>
98 98 <view class="flex-level" wx:if="{{is_act}}">
99 99 <view class="fs30 flex-level white receive" data-url="/pages/giftpack/evaluategift/evaluategift?actId={{actId}}&orderNumber={{order_id}}&orderGoodsId={{goods_id}}&giftBagId={{giftBagId}}" bindtap="goto">点击领取礼品</view>
... ...
pages/user/view_comment/view_comment.wxss renamed to packageB/pages/user/view_comment/view_comment.wxss
  View file @4deff54
pages/user/index/index.js
  View file @4deff54
... ... @@ -595,7 +595,7 @@ Page({
595 595  
596 596 switch (no) {
597 597 case "01":
598   - getApp().goto("/pages/user/user_coupon/user_coupon?img=" +
  598 + getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" +
599 599 url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
600 600 break;
601 601 case "02":
... ...
pages/user/order_detail/order_detail.wxml
  View file @4deff54
... ... @@ -164,9 +164,9 @@
164 164  
165 165 <block wx:if="{{order.order_status==2 && order.is_zsorder!=4}}">
166 166 <navigator wx:if="{{order.order_goods.length>1}}" class="tips-btn"
167   - url="/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
  167 + url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
168 168 <navigator wx:else class="tips-btn"
169   - url="/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
  169 + url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
170 170 </block>
171 171 <!-- 积分购 拼团 搭配购没有有再来一单 -->
172 172 <block wx:if="{{ (order.pay_status==1 || order.order_status==3) && order.pt_prom_id<=0 && order.integral<=0 && order.order_goods[0].prom_type!=5}}">
... ...
pages/user/order_list/order_list.wxml
  View file @4deff54
... ... @@ -183,9 +183,9 @@
183 183  
184 184 <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
185 185 <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white"
186   - url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
  186 + url="/packageB/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
187 187 <navigator wx:else class="order-btn white red-b"
188   - url="/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价</navigator>
  188 + url="/packageB/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价</navigator>
189 189 </block>
190 190  
191 191  
... ...
pages/user/userqy/userqy.js
  View file @4deff54
... ... @@ -190,7 +190,7 @@ Page({
190 190  
191 191 switch (no) {
192 192 case "01":
193   - getApp().goto("/pages/user/user_coupon/user_coupon?img="
  193 + getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img="
194 194 +url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id);
195 195 break;
196 196 case "02":
... ...