diff --git a/config.js b/config.js
index cef42d9..d0154b4 100644
--- a/config.js
+++ b/config.js
@@ -15,7 +15,7 @@ export default {
* 可在超管后台-商城列表中查看10025
*/
- storeId: wx.getExtConfigSync().store_id? wx.getExtConfigSync().store_id : 10045,
+ storeId: wx.getExtConfigSync().store_id? wx.getExtConfigSync().store_id : 10048,
// storeId: 10037,
diff --git a/ext.json b/ext.json
index 11f5b0e..d1f4139 100644
--- a/ext.json
+++ b/ext.json
@@ -1,7 +1,7 @@
{
"extEnable": true,
- "extAppid": "wx9f7e94fe11dc0c23",
+ "extAppid": "wxa3127ed5c3542a28",
"ext": {
- "store_id": 10045
+ "store_id": 10048
}
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 85406bd..8a94b76 100644
--- a/manifest.json
+++ b/manifest.json
@@ -92,7 +92,11 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
+<<<<<<< HEAD
"appid" : "wxe843b6d7a4bd3389",
+=======
+ "appid" : "wxa3127ed5c3542a28",
+>>>>>>> beac19d5a037464834b39080367b0ebe8183fee7
"libVersion" : "latest",
"setting" : {
// 是否检查安全域名和 TLS 版本
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index c211368..5b214ef 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -941,7 +941,7 @@
.replace(/
{
this.$set(this.goods, item, info[item])
})
@@ -2256,4 +2256,4 @@
text-align: center;
margin-right: 12rpx;
}
-
+
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 4d356c0..e1c75a3 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -569,7 +569,7 @@
handleTargetExpress(orderId, item) {
if (item.delivery) {
let url =item.delivery[0].express_no
- if (this.containsLetterMix(url, 'jd.com')&&item.delivery.length>0) {
+ if (this.containsLetterMix(url, 'http')&&item.delivery.length>0) {
uni.navigateTo({
url: '/pages/order/express/webView?src=' + encodeURIComponent(url) //url是h5的展示地址pageB
})
@@ -1561,4 +1561,4 @@
font-size: 36rpx;
}
}
-
+
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 62b64c6..7e8b584 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -259,9 +259,9 @@
this.getOrderList();
}
},
- methods: {
- handleOk() {
-
+ methods: {
+ handleOk() {
+
},
meKone() {
this.cdDia = false
@@ -272,7 +272,7 @@
app.getOrderList(1)
},
changeMenu(index) {
- this.list.forEach((item, ind) => {
+ this.list.forEach((item, ind) => {
item.menushow = !item.menushow;
});
},
@@ -319,7 +319,7 @@
// 切换标签项
onChangeTab(item, index) {
const app = this
- app.list = []
+ app.list = []
app.pageNum = 1
// 设置当前选中的标签
app.current = index
@@ -345,8 +345,8 @@
.then(result => {
// 显示成功信息
app.$toast(result.message)
- // 刷新订单列表
- app.list = []
+ // 刷新订单列表
+ app.list = []
app.pageNum = 1
app.getOrderList()
})
@@ -369,8 +369,8 @@
// 显示成功信息
app.$toast(result.message)
// 刷新订单列表
- app.list = []
- app.pageNum = 1
+ app.list = []
+ app.pageNum = 1
app.getOrderList()
})
}
@@ -397,8 +397,8 @@
// 显示成功信息
app.$success(result.message)
// 刷新订单列表
- app.list = []
- app.pageNum = 1
+ app.list = []
+ app.pageNum = 1
app.getOrderList()
})
}
@@ -446,21 +446,21 @@
containsLetterMix(str, mix) {
return new RegExp(mix.split('').join('\\w*')).test(str)
},
- //数组对象去重
- arrayUnique(arr, name) {
- var hash = {};
- return arr.reduce(function (item, next) {
- hash[next[name]]
- ? ""
- : (hash[next[name]] = true && item.push(next));
- return item;
- }, []);
+ //数组对象去重
+ arrayUnique(arr, name) {
+ var hash = {};
+ return arr.reduce(function (item, next) {
+ hash[next[name]]
+ ? ""
+ : (hash[next[name]] = true && item.push(next));
+ return item;
+ }, []);
},
// 点击去物流
onLogistics(orderId, item) {
if (item.delivery) {
let url = item.delivery.express_no
- if (this.containsLetterMix(url, 'jd.com')) {
+ if (this.containsLetterMix(url, 'http')) {
uni.navigateTo({
url: '/pages/order/express/webView?src=' + encodeURIComponent(url) //url是h5的展示地址pageB
})
diff --git a/pages/refund/detail.vue b/pages/refund/detail.vue
index a794d54..d86c97e 100644
--- a/pages/refund/detail.vue
+++ b/pages/refund/detail.vue
@@ -1,121 +1,121 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ detail.orderGoods.goods_name }}
-
-
-
-
-
- {{ props.value.name }}
-
-
-
- ×{{ detail.orderGoods.total_num }}
-
-
-
-
-
-
-
- 商品金额：
- ￥{{ detail.orderGoods.total_pay_price }}
-
-
-
-
-
- 已退款金额：
- ￥{{ detail.refund_money }}
-
-
-
-
-
-
-
- 售后类型：
-
-
- {{ detail.type == 30?'退款':'退货' }}
-
-
-
-
- 申请原因：
-
-
- {{ detail.apply_desc }}
-
-
-
-
- 申请凭证：
-
-
-
-
-
-
-
-
-
-
-
-
-
- 拒绝原因：
-
-
- {{ detail.refuse_desc }}
-
-
-
-
-
-
-
- 退货物流信息
-
-
-
- 物流公司：{{ detail.express.express_name }}
-
-
- 物流单号：{{ detail.express_no }}
-
-
- 发货状态：{{ detail.is_user_send ? '已发货' : '未发货' }}
-
-
- 发货时间：{{ detail.send_time }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ detail.orderGoods.goods_name }}
+
+
+
+
+
+ {{ props.value.name }}
+
+
+
+ ×{{ detail.orderGoods.total_num }}
+
+
+
+
+
+
+
+ 商品金额：
+ ￥{{ detail.orderGoods.total_pay_price }}
+
+
+
+
+
+ 已退款金额：
+ ￥{{ detail.refund_money }}
+
+
+
+
+
+
+
+ 售后类型：
+
+
+ {{ detail.type == 30?'退款':'退货' }}
+
+
+
+
+ 申请原因：
+
+
+ {{ detail.apply_desc }}
+
+
+
+
+ 申请凭证：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 拒绝原因：
+
+
+
+
+
+
+
+
+
+ 退货物流信息
+
+
+
+ 物流公司：{{ detail.express.express_name }}
+
+
+ 物流单号：{{ detail.express_no }}
+
+
+ 发货状态：{{ detail.is_user_send ? '已发货' : '未发货' }}
+
+
+ 发货时间：{{ detail.send_time }}
+
+
+
+
+
@@ -148,366 +148,379 @@
-
-
-
-
-
-
-
-
-
-
-