diff --git a/app.js b/app.js
index 8f5180b..28c0596 100644
--- a/app.js
+++ b/app.js
@@ -989,7 +989,14 @@ App({
};
},
});
- };
+ }
+ else{
+ wx.showModal({
+ content: '商家未设置客服热线',
+ showCancel: 0,
+
+ });
+ }
});
},
diff --git a/components/com_servicer/com_servicer.wxml b/components/com_servicer/com_servicer.wxml
index 81c8f82..56c9844 100644
--- a/components/com_servicer/com_servicer.wxml
+++ b/components/com_servicer/com_servicer.wxml
@@ -5,7 +5,7 @@
-
+
客服热线：
{{store_tel}}
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index abf7f1b..c93b2fd 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -958,7 +958,7 @@
-
+
客服热线：
{{store_tel}}
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index 063418c..eb4ee7e 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -926,7 +926,7 @@
-
+
客服热线：
{{store_tel}}
diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
index 31cd6c0..da9ecc7 100644
--- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
+++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
@@ -82,7 +82,17 @@ Page({
r.order_status_detail="待支付"; r.pay_btn=1;
}
if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
- r.order_status_detail = "待发货";
+ {
+ //自提的话
+ if (r.exp_type==1)
+ {
+ r.order_status_detail = "待自提";
+ }
+ else
+ {
+ r.order_status_detail = "待发货";
+ }
+ }
if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
r.order_status_detail = "待收货";r.receive_btn=1;
diff --git a/packageD/pages/AI-test-skin/analyse/analyse.js b/packageD/pages/AI-test-skin/analyse/analyse.js
index 52775d1..fd10228 100644
--- a/packageD/pages/AI-test-skin/analyse/analyse.js
+++ b/packageD/pages/AI-test-skin/analyse/analyse.js
@@ -26,6 +26,7 @@ Page({
err_map: null,
skin_type: 0,
ce_user_id:0,
+ img_remark:''
},
/**
@@ -36,6 +37,7 @@ Page({
var plugin = requirePlugin('mtSkinSdk')
plugin.setConfig(pluginGD)
}
+ this.setData({img_remark:options.img_remark})
if(options.ce_user_id)
this.data.ce_user_id=options.ce_user_id;
@@ -519,6 +521,7 @@ Page({
resultjson: JSON.stringify(analyse_data),
detectjson: JSON.stringify(analyse_info),
skin_type: 1,
+ img_remark:th.data.img_remark
}
//要保存一下分析的结果
th.json_post("/api/weshop/face/storeSkinface/save", req_data, function (res) {
@@ -556,6 +559,8 @@ Page({
resultjson: JSON.stringify(res.data.data),
detectjson: JSON.stringify(th.data.check_data),
skin_type: 0,
+ img_remark:th.data.img_remark
+
}
var txt=[];
diff --git a/packageD/pages/AI-test-skin/history_record/history_record.js b/packageD/pages/AI-test-skin/history_record/history_record.js
index 640e4cb..fb2abf6 100644
--- a/packageD/pages/AI-test-skin/history_record/history_record.js
+++ b/packageD/pages/AI-test-skin/history_record/history_record.js
@@ -203,6 +203,7 @@ Page({
for (let i = 0; i < data.length; i++) {
let history = data[i];
let id = history.id;
+ let img_remark = history.img_remark;
let now = new Date(history['addtime'] * 1000);
let year = now.getFullYear(); //年
let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
@@ -218,10 +219,12 @@ Page({
let obj = {
time,
id,
+ img_remark,
};
if (arr.length > 0) {
let index = arr.findIndex(item => {
return item['history_time'] === history_time;
+
})
if (index > -1) {
arr[index]['time_arr'].push(obj);
diff --git a/packageD/pages/AI-test-skin/history_record/history_record.wxml b/packageD/pages/AI-test-skin/history_record/history_record.wxml
index 4fd17de..2410a79 100644
--- a/packageD/pages/AI-test-skin/history_record/history_record.wxml
+++ b/packageD/pages/AI-test-skin/history_record/history_record.wxml
@@ -14,9 +14,14 @@
{{item.history_time}}
-
+
+
+ {{subitem.img_remark}}
+
{{subitem.time}}
去查看
+
+
diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.js b/packageD/pages/AI-test-skin/select_photo/select_photo.js
index f727d19..ab9dc5e 100644
--- a/packageD/pages/AI-test-skin/select_photo/select_photo.js
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.js
@@ -13,7 +13,8 @@ Page({
iurl: setting.imghost,
gl_skin_img: null,
skin_type: 0,
- ce_user_id:0
+ ce_user_id:0,
+ img_remark:''
},
/**
@@ -40,9 +41,13 @@ Page({
if (e.data.code == 0) {
getApp().globalData.face_img = e.data.data.img;
getApp().globalData.face_SourceImg = e.data.data.SourceImg;
- let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页
+ var getimg_remark=th.data.img_remark;
+
+
+ let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页
+ url+="?img_remark="+getimg_remark;
if(th.data.ce_user_id)
- url+="?ce_user_id="+th.data.ce_user_id;
+ url+="&ce_user_id="+th.data.ce_user_id;
console.log("select_ph");
console.log(url);
@@ -60,6 +65,20 @@ Page({
})
},
+
+ getInput(e) {
+ let val = e.detail.value;
+ if (val) {
+ this.setData({
+ img_remark: e.detail.value,
+ });
+ } else {
+ this.setData({
+ img_remark: '',
+ });
+ }
+
+ },
//-- 重新从相册中选择图片 --
show_pai_pop: function () {
var th = this;
diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.wxml b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
index 3c33116..1207659 100644
--- a/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
+++ b/packageD/pages/AI-test-skin/select_photo/select_photo.wxml
@@ -3,6 +3,11 @@
+
+
+
+
+