diff --git a/app.js b/app.js
index 27c6255..1d69084 100644
--- a/app.js
+++ b/app.js
@@ -61,7 +61,6 @@ App({
getu: null, //记录会员信息
sessionKey: null,//记录会员信息
openid: null, //记录会员信息
-
to_group: null, //参团传递的数据
wxapp_buy_obj: null, //微信小程序购买的Object
pk_store: null, //选择的门店
@@ -70,7 +69,6 @@ App({
windowWidth: 0, //整个窗体的宽度
room_id: null, //直播间分享的房间ID
room_goods_id: null, //直播间分享的商品ID
-
},
auth: o,
request: a,
@@ -671,20 +669,25 @@ App({
//清空登录时候缓存的值
onHide: function () {
- this.globalData.is_test = 0;
- this.globalData.guide_id = null; //导购清空
- this.globalData.first_leader = null; //分享的会员清空
- this.globalData.wuliu = null; //关闭要把物流清空
- this.globalData.room_id = null; //关闭要把房间号关闭
- this.globalData.room_goods_id = null; //关闭要把物流清空
- this.globalData.config2 = null; //清除config2的缓存
- this.globalData.config = null; //清除config的缓存
- this.globalData.gr_index = 0; //商品分组的序列
- this.globalData.pk_store = null;
- this.globalData.wxapp_buy_obj = null;
- this.globalData.dis_buy_obj = null; //等级卡的购买记录
- this.globalData.storeFooter = null; //底部的导航
- this.globalData.full_screen = null; //全屏
+
+ if(!this.globalData.no_clear) {
+ this.globalData.is_test = 0;
+ this.globalData.guide_id = null; //导购清空
+ this.globalData.first_leader = null; //分享的会员清空
+ this.globalData.wuliu = null; //关闭要把物流清空
+ this.globalData.room_id = null; //关闭要把房间号关闭
+ this.globalData.room_goods_id = null; //关闭要把物流清空
+ this.globalData.config2 = null; //清除config2的缓存
+ this.globalData.config = null; //清除config的缓存
+ this.globalData.gr_index = 0; //商品分组的序列
+ this.globalData.pk_store = null;
+ this.globalData.wxapp_buy_obj = null;
+ this.globalData.dis_buy_obj = null; //等级卡的购买记录
+ this.globalData.storeFooter = null; //底部的导航
+ this.globalData.full_screen = null; //全屏
+ }else{
+ this.globalData.no_clear=0;
+ }
},
@@ -826,7 +829,54 @@ App({
},
+ //b是数组，t是wxml元素返回的
+ pre_img2(b,t){
+ this.globalData.no_clear=1;
+ wx.previewImage({
+ current: b[t.currentTarget.dataset.id],
+ urls: b
+ });
+ },
+ con_wx(th){
+ var url=th.data.sys_switch.weapp_customertype_url;
+ var id=th.data.sys_switch.weapp_customertype_appid;
+ this.globalData.no_clear=1;
+ wx.openCustomerServiceChat({
+ extInfo: {url: url},
+ corpId: id,
+ success(res) {}
+ })
+ },
+
+ con_Service(){
+ var th=this;
+ var oss= this.globalData.setting;
+ this.getConfig(function(t) {
+ if (t.store_tel == undefined) {
+ th.request.get("/api/weshop/store/get/" + oss.stoid, {
+ isShowLoading: 1,
+ data: {},
+ success: function(rs) {
+ th.globalData.config = rs.data.data;
+ if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+ wx.showToast({
+ title: "商家未设置电话",
+ icon: 'none',
+ duration: 3000
+ })
+ return false;
+ }
+ th.globalData.no_clear=1;
+ wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
+ }
+ })
+ } else {
+ th.globalData.no_clear=1;
+ wx.makePhoneCall({ phoneNumber: t.store_tel, })
+ }
+ });
+ }
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..70fb98e 100644
--- a/packageD/pages/AI-test-skin/history_record/history_record.wxml
+++ b/packageD/pages/AI-test-skin/history_record/history_record.wxml
@@ -11,7 +11,7 @@
历史报告
-
+
{{item.history_time}}
@@ -19,7 +19,7 @@
去查看
-
+
- 没有更多了 -
\ No newline at end of file
diff --git a/packageD/pages/AI-test-skin/success_result/success_result.js b/packageD/pages/AI-test-skin/success_result/success_result.js
index e606b81..2f57173 100644
--- a/packageD/pages/AI-test-skin/success_result/success_result.js
+++ b/packageD/pages/AI-test-skin/success_result/success_result.js
@@ -1,7 +1,7 @@
/*
* @Author: abson
* @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-28 16:01:07
+ * @LastEditTime: 2022-03-10 11:16:23
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
@@ -63,14 +63,7 @@ Page({
},
onReady: function () {
- //用异步的获取比较准一点
- wx.getSystemInfo({
- success(res) {
- console.log(111);
- console.log(res.windowWidth);
- console.log(res.windowHeight);
- }
- })
+
},
/**
@@ -134,7 +127,6 @@ Page({
var eye_data1 = face_data1.landmark150.eye_left_corner_right;
var eye_data2 = face_data1.landmark150.eye_left_corner_left;
var eye_data3 = face_data1.landmark150.eye_right_corner_right;
-
var hei1 = Math.abs(eye_data1.x - eye_data2.x);
var bili_eye = th.data.face_height * 0.56 / hei1;
var eye_top = eye_data1.y - hei1 / 2
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index e388ee1..1a8bf71 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2257,8 +2257,6 @@ Page({
var order_prom_txt1 = "formData.order_prom_id";
var order_prom_txt2 = "formData.order_prom_amount";
th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
-
-
total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
var atxt = "formData.total_amount";
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index ffde1e6..cd9cd45 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -274,8 +274,9 @@
- {{data.goods_name}}
-
+
+ {{data.goods_name}}
+
销量：{{prom_act.buy_num+prom_act.virtual}}件
@@ -391,6 +392,7 @@
+
{{data.goods_name}}
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 1a2ffe7..307929c 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -126,7 +126,9 @@ image {
.goods-title {
display: flex;
- justify-content: space-between;
+ justify-content: space-between;
+ align-items: center;
+ vertical-align: middle;
/* overflow: hidden; */
/* height: 108rpx; */
}