diff --git a/app.json b/app.json
index 1a93be2..1556432 100644
--- a/app.json
+++ b/app.json
@@ -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": "获取你的位置信息"
diff --git a/pages/user/add_comment/add_comment.js b/packageB/pages/user/add_comment/add_comment.js
index ae5369c..ae5369c 100644
--- a/pages/user/add_comment/add_comment.js
+++ b/packageB/pages/user/add_comment/add_comment.js
diff --git a/pages/user/add_comment/add_comment.json b/packageB/pages/user/add_comment/add_comment.json
index 401e4e6..401e4e6 100644
--- a/pages/user/add_comment/add_comment.json
+++ b/packageB/pages/user/add_comment/add_comment.json
diff --git a/pages/user/add_comment/add_comment.wxml b/packageB/pages/user/add_comment/add_comment.wxml
index 71d1232..aecfbcd 100644
--- a/pages/user/add_comment/add_comment.wxml
+++ b/packageB/pages/user/add_comment/add_comment.wxml
@@ -106,7 +106,7 @@
- 提交评价
+ 提交评价
diff --git a/pages/user/add_comment/add_comment.wxss b/packageB/pages/user/add_comment/add_comment.wxss
index 43c1670..43c1670 100644
--- a/pages/user/add_comment/add_comment.wxss
+++ b/packageB/pages/user/add_comment/add_comment.wxss
diff --git a/pages/user/collect_list/collect_list.js b/packageB/pages/user/collect_list/collect_list.js
index cc53c36..ea786ae 100644
--- a/pages/user/collect_list/collect_list.js
+++ b/packageB/pages/user/collect_list/collect_list.js
@@ -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() {
diff --git a/pages/user/collect_list/collect_list.json b/packageB/pages/user/collect_list/collect_list.json
index 64db42e..64db42e 100644
--- a/pages/user/collect_list/collect_list.json
+++ b/packageB/pages/user/collect_list/collect_list.json
diff --git a/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml
index 00f5f3b..00f5f3b 100644
--- a/pages/user/collect_list/collect_list.wxml
+++ b/packageB/pages/user/collect_list/collect_list.wxml
diff --git a/pages/user/collect_list/collect_list.wxss b/packageB/pages/user/collect_list/collect_list.wxss
index efd2d00..efd2d00 100644
--- a/pages/user/collect_list/collect_list.wxss
+++ b/packageB/pages/user/collect_list/collect_list.wxss
diff --git a/pages/user/comment/comment.js b/packageB/pages/user/comment/comment.js
index 051d8fa..9922c98 100644
--- a/pages/user/comment/comment.js
+++ b/packageB/pages/user/comment/comment.js
@@ -1,16 +1,16 @@
-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
});
}
},
diff --git a/pages/user/comment/comment.json b/packageB/pages/user/comment/comment.json
index 2b3db22..2b3db22 100644
--- a/pages/user/comment/comment.json
+++ b/packageB/pages/user/comment/comment.json
diff --git a/pages/user/comment/comment.wxml b/packageB/pages/user/comment/comment.wxml
index 4e77fe1..ad7859b 100644
--- a/pages/user/comment/comment.wxml
+++ b/packageB/pages/user/comment/comment.wxml
@@ -110,11 +110,11 @@
查看订单
-
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index fa867eb..d6799c5 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -183,9 +183,9 @@
评价
+ url="/packageB/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价
评价
+ 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}}">评价
diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js
index 4257cd2..9a244d0 100644
--- a/pages/user/userqy/userqy.js
+++ b/pages/user/userqy/userqy.js
@@ -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":