wxd / MShopWeApp

Commit a6163eaa59bef2ffc2c18475635a1e987fa9d0c3

Authored by 后端研发-苏泰源
2 parents 0f89417e 54585d17

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

# Conflicts:
#	app.js
Inline Side-by-side
Showing 6 changed files with 77 additions and 33 deletions
... ... @@ -61,7 +61,6 @@ App({
61 61 getu: null, //记录会员信息
62 62 sessionKey: null,//记录会员信息
63 63 openid: null, //记录会员信息
64   -
65 64 to_group: null, //参团传递的数据
66 65 wxapp_buy_obj: null, //微信小程序购买的Object
67 66 pk_store: null, //选择的门店
... ... @@ -70,7 +69,6 @@ App({
70 69 windowWidth: 0, //整个窗体的宽度
71 70 room_id: null, //直播间分享的房间ID
72 71 room_goods_id: null, //直播间分享的商品ID
73   -
74 72 },
75 73 auth: o,
76 74 request: a,
... ... @@ -671,20 +669,25 @@ App({
671 669  
672 670 //清空登录时候缓存的值
673 671 onHide: function () {
674   - this.globalData.is_test = 0;
675   - this.globalData.guide_id = null; //导购清空
676   - this.globalData.first_leader = null; //分享的会员清空
677   - this.globalData.wuliu = null; //关闭要把物流清空
678   - this.globalData.room_id = null; //关闭要把房间号关闭
679   - this.globalData.room_goods_id = null; //关闭要把物流清空
680   - this.globalData.config2 = null; //清除config2的缓存
681   - this.globalData.config = null; //清除config的缓存
682   - this.globalData.gr_index = 0; //商品分组的序列
683   - this.globalData.pk_store = null;
684   - this.globalData.wxapp_buy_obj = null;
685   - this.globalData.dis_buy_obj = null; //等级卡的购买记录
686   - this.globalData.storeFooter = null; //底部的导航
687   - this.globalData.full_screen = null; //全屏
  672 +
  673 + if(!this.globalData.no_clear) {
  674 + this.globalData.is_test = 0;
  675 + this.globalData.guide_id = null; //导购清空
  676 + this.globalData.first_leader = null; //分享的会员清空
  677 + this.globalData.wuliu = null; //关闭要把物流清空
  678 + this.globalData.room_id = null; //关闭要把房间号关闭
  679 + this.globalData.room_goods_id = null; //关闭要把物流清空
  680 + this.globalData.config2 = null; //清除config2的缓存
  681 + this.globalData.config = null; //清除config的缓存
  682 + this.globalData.gr_index = 0; //商品分组的序列
  683 + this.globalData.pk_store = null;
  684 + this.globalData.wxapp_buy_obj = null;
  685 + this.globalData.dis_buy_obj = null; //等级卡的购买记录
  686 + this.globalData.storeFooter = null; //底部的导航
  687 + this.globalData.full_screen = null; //全屏
  688 + }else{
  689 + this.globalData.no_clear=0;
  690 + }
688 691  
689 692 },
690 693  
... ... @@ -826,7 +829,54 @@ App({
826 829 },
827 830  
828 831  
  832 + //b是数组，t是wxml元素返回的
  833 + pre_img2(b,t){
  834 + this.globalData.no_clear=1;
  835 + wx.previewImage({
  836 + current: b[t.currentTarget.dataset.id],
  837 + urls: b
  838 + });
  839 + },
829 840  
  841 + con_wx(th){
  842 + var url=th.data.sys_switch.weapp_customertype_url;
  843 + var id=th.data.sys_switch.weapp_customertype_appid;
  844 + this.globalData.no_clear=1;
  845 + wx.openCustomerServiceChat({
  846 + extInfo: {url: url},
  847 + corpId: id,
  848 + success(res) {}
  849 + })
  850 + },
  851 +
  852 + con_Service(){
  853 + var th=this;
  854 + var oss= this.globalData.setting;
  855 + this.getConfig(function(t) {
  856 + if (t.store_tel == undefined) {
  857 + th.request.get("/api/weshop/store/get/" + oss.stoid, {
  858 + isShowLoading: 1,
  859 + data: {},
  860 + success: function(rs) {
  861 + th.globalData.config = rs.data.data;
  862 + if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
  863 + wx.showToast({
  864 + title: "商家未设置电话",
  865 + icon: 'none',
  866 + duration: 3000
  867 + })
  868 + return false;
  869 + }
  870 + th.globalData.no_clear=1;
  871 + wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
  872 + }
  873 + })
  874 + } else {
  875 + th.globalData.no_clear=1;
  876 + wx.makePhoneCall({ phoneNumber: t.store_tel, })
  877 + }
  878 + });
  879 + }
830 880  
831 881  
832 882  
... ...
packageD/pages/AI-test-skin/history_record/history_record.wxml
  View file @a6163ea
... ... @@ -11,7 +11,7 @@
11 11 </view>
12 12 </view>
13 13 <view class="mgb5">历史报告</view>
14   - <view class="history_list">
  14 + <scroll-view enable-flex scroll-y class="history_list" bindscrolltolower="bindscrolltolower">
15 15 <view class="history_list_month" wx:for="{{history}}">
16 16 <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.history_time}}</view>
17 17 <view class="souce" wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
... ... @@ -19,7 +19,7 @@
19 19 <view style="color: #9b9b9b;" >去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
20 20 </view>
21 21 </view>
22   - </view>
  22 + </scroll-view>
23 23 <view class="no-more txt-center" wx:if="{{history.length > 0 && no_more}}">- 没有更多了 -</view>
24 24 <nodata class="t-c" wx:if="{{history.length==0 && is_get}}"></nodata>
25 25 </view>
26 26 \ No newline at end of file
... ...
packageD/pages/AI-test-skin/success_result/success_result.js
  View file @a6163ea
1 1 /*
2 2 * @Author: abson
3 3 * @Date: 2022-02-16 15:36:47
4   - * @LastEditTime: 2022-02-28 16:01:07
  4 + * @LastEditTime: 2022-03-10 11:16:23
5 5 * @LastEditors: Please set LastEditors
6 6 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
7 7 * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
... ... @@ -63,14 +63,7 @@ Page({
63 63 },
64 64  
65 65 onReady: function () {
66   - //用异步的获取比较准一点
67   - wx.getSystemInfo({
68   - success(res) {
69   - console.log(111);
70   - console.log(res.windowWidth);
71   - console.log(res.windowHeight);
72   - }
73   - })
  66 +
74 67 },
75 68  
76 69 /**
... ... @@ -134,7 +127,6 @@ Page({
134 127 var eye_data1 = face_data1.landmark150.eye_left_corner_right;
135 128 var eye_data2 = face_data1.landmark150.eye_left_corner_left;
136 129 var eye_data3 = face_data1.landmark150.eye_right_corner_right;
137   -
138 130 var hei1 = Math.abs(eye_data1.x - eye_data2.x);
139 131 var bili_eye = th.data.face_height * 0.56 / hei1;
140 132 var eye_top = eye_data1.y - hei1 / 2
... ...
pages/cart/cart2/cart2.js
  View file @a6163ea
... ... @@ -2257,8 +2257,6 @@ Page({
2257 2257 var order_prom_txt1 = "formData.order_prom_id";
2258 2258 var order_prom_txt2 = "formData.order_prom_amount";
2259 2259 th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
2260   -
2261   -
2262 2260 total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
2263 2261 order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
2264 2262 var atxt = "formData.total_amount";
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @a6163ea
... ... @@ -274,8 +274,9 @@
274 274 </view>
275 275 </view>
276 276 <view class="goods-title">
277   - <view class="goods-name elli">{{data.goods_name}}</view>
278   - </view>
  277 + <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
  278 + <view class="goods-name elli">{{data.goods_name}}</view>
  279 + </view>
279 280 <view class="goods-num">
280 281 <view class="sales">销量：{{prom_act.buy_num+prom_act.virtual}}件</view>
281 282 <view class="stock">
... ... @@ -391,6 +392,7 @@
391 392 <!-- 许程商品名字 -->
392 393 <view wx:if="{{prom_type!=1 && prom_type!=2 }}">
393 394 <view class="goods-title">
  395 + <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
394 396 <view class="goods-name elli">{{data.goods_name}}</view>
395 397 </view>
396 398 </view>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @a6163ea
... ... @@ -126,7 +126,9 @@ image {
126 126  
127 127 .goods-title {
128 128 display: flex;
129   - justify-content: space-between;
  129 + justify-content: space-between;
  130 + align-items: center;
  131 + vertical-align: middle;
130 132 /* overflow: hidden; */
131 133 /* height: 108rpx; */
132 134 }
... ...