Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents a2eb5892 4deff541
Showing 27 changed files with 51 additions and 38 deletions
app.json
pages/user/add_comment/add_comment.js → packageB/pages/user/add_comment/add_comment.js
pages/user/add_comment/add_comment.json → packageB/pages/user/add_comment/add_comment.json
pages/user/add_comment/add_comment.wxml → packageB/pages/user/add_comment/add_comment.wxml
pages/user/add_comment/add_comment.wxss → packageB/pages/user/add_comment/add_comment.wxss
pages/user/collect_list/collect_list.js → packageB/pages/user/collect_list/collect_list.js
pages/user/collect_list/collect_list.json → packageB/pages/user/collect_list/collect_list.json
pages/user/collect_list/collect_list.wxml → packageB/pages/user/collect_list/collect_list.wxml
pages/user/collect_list/collect_list.wxss → packageB/pages/user/collect_list/collect_list.wxss
pages/user/comment/comment.js → packageB/pages/user/comment/comment.js
pages/user/comment/comment.json → packageB/pages/user/comment/comment.json
pages/user/comment/comment.wxml → packageB/pages/user/comment/comment.wxml
pages/user/comment/comment.wxss → packageB/pages/user/comment/comment.wxss
pages/user/user_coupon/c_filter.wxs → packageB/pages/user/user_coupon/c_filter.wxs
pages/user/user_coupon/filter.wxs → packageB/pages/user/user_coupon/filter.wxs
pages/user/user_coupon/user_coupon.js → packageB/pages/user/user_coupon/user_coupon.js
pages/user/user_coupon/user_coupon.json → packageB/pages/user/user_coupon/user_coupon.json
pages/user/user_coupon/user_coupon.wxml → packageB/pages/user/user_coupon/user_coupon.wxml
pages/user/user_coupon/user_coupon.wxss → packageB/pages/user/user_coupon/user_coupon.wxss
pages/user/view_comment/view_comment.js → packageB/pages/user/view_comment/view_comment.js
@@ -19,8 +19,7 @@
     "pages/user/coupon/coupon",
     "pages/user/checkcoupon/checkcoupon",
     "pages/user/add_address/add_address",
-    "pages/user/withdrawals_list/withdrawals_list",
-    "pages/user/add_comment/add_comment",
+    "pages/user/withdrawals_list/withdrawals_list",  
     "pages/user/return_goods_info/return_goods_info",
     "pages/user/return_goods/return_goods",
     "pages/user/withdrawals/withdrawals",
@@ -50,8 +49,7 @@
     "pages/user/integral/msg/msg",
     "pages/user/userqy/userqy",
     "pages/user/user_spsy/user_spsy",
-    "pages/user/user_fw/user_fw",
-    "pages/user/user_coupon/user_coupon",
+    "pages/user/user_fw/user_fw",  
     "pages/user/grow_value/grow_value",
     "pages/payment/pay_success/pay_success",
     "pages/user/plus/plus",
@@ -66,10 +64,8 @@
     "pages/user/my_service/tment_eval",
     "pages/user/my_service/tment_order_list",
     "pages/user/my_service/beauty_deta",
-    "pages/user/labels/labels",
-    "pages/user/view_comment/view_comment",
-    "pages/giftpack/birthdaygift/birthdaygift",
-    "pages/user/comment/comment",
+    "pages/user/labels/labels",  
+    "pages/giftpack/birthdaygift/birthdaygift", 
     "pages/giftpack/evaluategift/evaluategift",
     "pages/giftpack/newvipgift/newvipgift",
     "pages/giftpack/payment/payment",
@@ -88,7 +84,7 @@
 		"pages/cart/cart2_inte/cart2_inte",
 		"pages/giftpack/festival/festival",
 		"pages/team/team_more/team_more",
-		"pages/user/collect_list/collect_list",
+	
 		"pages/user/deposit/deposit",
 		"pages/user/deposit/prepaid/msg/msg",
 		"pages/user/deposit/prepaid/prepaid",
@@ -96,7 +92,7 @@
   ],
   "plugins": {
     "live-player-plugin": {
-      "version": "1.2.5",
+      "version": "1.3.0",
       "provider": "wx2b03c6e691cd7370"
     }
   },
@@ -141,10 +137,25 @@
 				 "pages/my_service/tment_order_list",
 				 "pages/my_service/beauty_deta",
 				 "pages/profile/profile",
-				 "pages/parseHtml/parseHtml"
+         "pages/parseHtml/parseHtml"
+         
       ]
  
-  }],
+  },
+  {
+    "root": "packageB/",
+    "name":"pack2",
+    "pages": [            
+      "pages/user/collect_list/collect_list",
+      "pages/user/comment/comment",
+      "pages/user/view_comment/view_comment",
+      "pages/user/add_comment/add_comment",
+      "pages/user/user_coupon/user_coupon"
+    ]
+    
+}
+
+],
   "permission": {
     "scope.userLocation": {
       "desc": "获取你的位置信息"
@@ -106,7 +106,7 @@
   </view>
  
   <view class="Submission flex-level ">
-    <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>
+    <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>
   </view>
 </view>
  
@@ -2,13 +2,13 @@ var t = function(t) {
     return t && t.__esModule ? t : {
       default: t
     };
-  }(require("../../../utils/LoadMore.js")),
+  }(require("../../../../utils/LoadMore.js")),
   e = getApp(),
   a = e.request,
   o = new t.default();
 var oo = e.globalData.setting,
   app_d = e.globalData;
-var ut = require('../../../utils/util.js');
+var ut = require('../../../../utils/util.js');
  
 Page({
   data: {
@@ -29,6 +29,7 @@ Page({
     isdelete: 0
   },
   onLoad: function() {
+
     o.init(this, "", "collects"),
       this.requestCollectList();
   },
@@ -50,8 +51,11 @@ Page({
           is_goods: 1
         })
         var goods_list = th.selectComponent("#goods_recommend"); //组件的id
-        goods_list.init();
-        setTimeout(function () { goods_list.get_list(); }, 300)  
+        if (goods_list)
+        {
+          goods_list.init();
+          setTimeout(function () { goods_list.get_list(); }, 300)  
+        }
       }
     });
   },
@@ -130,9 +134,8 @@ Page({
  
  
   goto: function(ee) {
-    wx.navigateTo({
-      url: '/pages/index/index/index',
-    })
+    getApp().goto("/pages/index/index/index");
+    
   },
   //编辑商品显示
   editcollects: function() {
-var ut = require("../../../utils/util.js");
+var ut = require("../../../../utils/util.js");
 var t = function(t) {
     return t && t.__esModule ? t : {
       default: t
     };
-  }(require("../../../utils/LoadMore.js")),
+  }(require("../../../../utils/LoadMore.js")),
   e = getApp(),
   rq = e.request,
   a = new t.default(),
-  s = require("../../../utils/util.js"),
+  s = require("../../../../utils/util.js"),
   oo = e.globalData,
   os = e.globalData.setting;
-var regeneratorRuntime = require('../../../utils/runtime.js');
+var regeneratorRuntime = require('../../../../utils/runtime.js');
  
 Page({
   data: {
@@ -117,7 +117,7 @@ Page({
         var n = "?order_id=" + a[s].order_id;
         n += "&goods_id=" + a[s].goods_id, n += "&price=" + a[s].goods_price;
         wx.navigateTo({
-          url: "/pages/user/add_comment/add_comment" + n
+          url: "/packageB/pages/user/add_comment/add_comment" + n
         });
     }
   },
@@ -110,11 +110,11 @@
             <view>查看订单</view>
           </navigator>
  
-          <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}}">
+          <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}}">
             <view>查看评价</view>
           </navigator>
  
-          <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}}':''}}">
+          <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}}':''}}">
             <view class="fs24">去评价</view>
           </navigator>
         </view>
-// pages/user/user_coupon/user_coupon.js
 var e = getApp(),os = e.globalData.setting;
-var utils = require('../../../utils/util.js');
-var regeneratorRuntime = require('../../../utils/runtime.js');
+var utils = require('../../../../utils/util.js');
+var regeneratorRuntime = require('../../../../utils/runtime.js');
  
 Page({
   /**
-var i = require("../../../utils/util.js"),
+var i = require("../../../../utils/util.js"),
   ut = i;
 var e = getApp(),
   a = e.globalData.setting,
@@ -93,7 +93,7 @@
 <!-- 是否匿名评价 -->
 <view class="Whether" wx:if="{{comment.length>0}}">
   <view class="Submission flex-level ">
-    <view class="fs30 flex-level white " bindtap="goto" data-url="/pages/user/comment/comment">评价其他</view>
+    <view class="fs30 flex-level white " bindtap="goto" data-url="/packageB/pages/user/comment/comment">评价其他</view>
   </view>
   <view class="flex-level" wx:if="{{is_act}}">
     <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>
@@ -595,7 +595,7 @@ Page({
  
     switch (no) {
       case "01":
-        getApp().goto("/pages/user/user_coupon/user_coupon?img=" +
+        getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" +
           url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
         break;
       case "02":
@@ -164,9 +164,9 @@
  
         <block wx:if="{{order.order_status==2 && order.is_zsorder!=4}}">
             <navigator wx:if="{{order.order_goods.length>1}}"  class="tips-btn"
-                       url="/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
+                       url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
             <navigator wx:else  class="tips-btn"
-                       url="/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
+                       url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
         </block>
 		<!-- 积分购  拼团 搭配购没有有再来一单 -->
 		<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}}">
@@ -183,9 +183,9 @@
  
 	          <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
 	            <navigator wx:if="{{item.order_goods.length>1}}"  class="order-btn white"
-	                       url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
+	                       url="/packageB/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
 	            <navigator wx:else  class="order-btn white red-b"
-	                       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>
+	                       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>
 	          </block>
  
  
@@ -190,7 +190,7 @@ Page({
  
       switch (no) {
           case "01":
-              getApp().goto("/pages/user/user_coupon/user_coupon?img="
+              getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img="
                   +url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id);
               break;
           case "02":