wxd / MShopWeApp

Commit d2a1ee8a37d3ca92e5b6c2b87f4567ecd7c2d916

Authored by 后端研发-苏泰源
2 parents 4235b265 6b3e9b92

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

Inline Side-by-side
Showing 7 changed files with 191 additions and 70 deletions
packageB/pages/AI-test-skin/success_result/success_result.js
  View file @d2a1ee8
1 1 /*
2 2 * @Author: abson
3 3 * @Date: 2022-02-16 15:36:47
4   - * @LastEditTime: 2022-02-18 14:00:54
  4 + * @LastEditTime: 2022-02-18 17:40:05
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
... ... @@ -13,16 +13,18 @@ const os = app.globalData;
13 13 const setting = os.setting;
14 14 const ut = require('../../../../utils/util');
15 15 Page({
16   -
17 16 /**
18 17 * 页面的初始数据
19 18 */
20 19 data: {
21 20 tab: [{ id: 'zong_he', name: '综合肤质' }, { id: 'mao_kong', name: '毛孔' }, { id: 'hei_tou', name: '黑头' }, { id: 'se_ban', name: '色斑' }, { id: 'zhou_wen', name: '皱纹' }, { id: 'hei_yan_quan', name: '黑眼圈' }, { id: 'cuo_chuang', name: '痤疮' }, { id: 'ming_gan_ji', name: '敏感度' }],
22 21 currentIndex: 0,
23   - tab_id:'zong_he',
  22 + tab_id: 'zong_he',
24 23 iurl: setting.imghost,
25   - showDialog:false,
  24 + showDialog: false,
  25 + yanjing: true,
  26 + img_scale: true, //问题标注放大图片
  27 + img_scale_icon:true,
26 28 },
27 29  
28 30 /**
... ... @@ -52,6 +54,17 @@ Page({
52 54 tab_id,
53 55 })
54 56 },
  57 + click_yanjing() {
  58 + this.setData({
  59 + yanjing: !this.data.yanjing,
  60 + })
  61 + },
  62 + click_fangda() {
  63 + this.setData({
  64 + img_scale: !this.data.img_scale,
  65 + img_scale_icon:!this.data.yanjing,
  66 + })
  67 + },
55 68  
56 69 /**
57 70 * 生命周期函数--监听页面隐藏
... ... @@ -66,6 +79,24 @@ Page({
66 79 onUnload: function () {
67 80  
68 81 },
  82 + show_dailog() {
  83 + this.setData({
  84 + showDialog: true,
  85 + })
  86 + },
  87 +
  88 + close_dialog() {
  89 + this.setData({
  90 + showDialog: false,
  91 + })
  92 + },
  93 +
  94 + close_mask() {
  95 + this.setData({
  96 + showDialog: false,
  97 + img_scale: true,
  98 + })
  99 + },
69 100  
70 101 /**
71 102 * 页面相关事件处理函数--监听用户下拉动作
... ...
packageB/pages/AI-test-skin/success_result/success_result.wxml
  View file @d2a1ee8
... ... @@ -69,7 +69,7 @@
69 69 <view style="color: #45d4eb;">#01</view>
70 70 <view class="flex-space-between">
71 71 <text style="font-size: 42rpx;" class="bold">毛孔</text>
72   - <view class="fs26" style="display: flex;align-items: center;">
  72 + <view class="fs26" catchtap="show_dailog" style="display: flex;align-items: center;">
73 73 <text>问题标注</text>
74 74 <text class="iconfont icon-xia"></text>
75 75 </view>
... ... @@ -100,19 +100,19 @@
100 100 <view class="analyse_classify_body">
101 101 <view class="mt_b10">
102 102 <view class="fenxi mgb10">原因分析</view>
103   - <view class="flex">
104   - <view>
  103 + <view class="flex wrap">
  104 + <view class="mr20">
105 105 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
106 106 <text class="fs26">皮脂腺分泌旺盛</text>
107 107 </view>
108   - <view>
  108 + <view class="mr20">
  109 + <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
  110 + <text class="fs26">皮脂腺分泌旺盛</text>
  111 + </view>
  112 + <view class="mr20">
109 113 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
110 114 <text class="fs26">皮脂腺分泌旺盛</text>
111 115 </view>
112   - <!-- <view>
113   - <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
114   - <text class="fs26">皮脂腺分泌旺盛</text>
115   - </view> -->
116 116 </view>
117 117 </view>
118 118  
... ... @@ -245,19 +245,15 @@
245 245 <view class="analyse_classify_body">
246 246 <view class="mt_b10">
247 247 <view class="fenxi mgb10">原因分析</view>
248   - <view class="flex">
249   - <view>
  248 + <view class="flex wrap">
  249 + <view class="mr20">
250 250 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
251 251 <text class="fs26">皮脂腺分泌旺盛</text>
252 252 </view>
253   - <view>
  253 + <view class="mr20">
254 254 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
255 255 <text class="fs26">皮脂腺分泌旺盛</text>
256 256 </view>
257   - <!-- <view>
258   - <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
259   - <text class="fs26">皮脂腺分泌旺盛</text>
260   - </view> -->
261 257 </view>
262 258 </view>
263 259  
... ... @@ -339,7 +335,7 @@
339 335 <view>
340 336 <view style="color: #45d4eb;">#05</view>
341 337 <view class="flex-space-between">
342   - <text style="font-size: 42rpx;" class="bold">黑眼圈</text>
  338 + <text style="font-size: 42rpx;" class="bold">黑眼圈</text>
343 339 <view class="fs26" style="display: flex;align-items: center;">
344 340 <text>问题标注</text>
345 341 <text class="iconfont icon-xia"></text>
... ... @@ -381,19 +377,16 @@
381 377 <view class="analyse_classify_body">
382 378 <view class="mt_b10">
383 379 <view class="fenxi mgb10">原因分析</view>
384   - <view class="flex">
385   - <view>
  380 + <view class="flex wrap">
  381 + <view class="mr20">
386 382 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
387 383 <text class="fs26">皮脂腺分泌旺盛</text>
388 384 </view>
389   - <view>
  385 + <view class="mr20">
390 386 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
391 387 <text class="fs26">皮脂腺分泌旺盛</text>
392 388 </view>
393   - <!-- <view>
394   - <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
395   - <text class="fs26">皮脂腺分泌旺盛</text>
396   - </view> -->
  389 +
397 390 </view>
398 391 </view>
399 392  
... ... @@ -538,12 +531,12 @@
538 531 <view class="analyse_classify_body">
539 532 <view class="mt_b10">
540 533 <view class="fenxi mgb10">原因分析</view>
541   - <view class="flex">
542   - <view>
  534 + <view class="flex wrap">
  535 + <view class="mr20">
543 536 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
544 537 <text class="fs26">皮脂腺分泌旺盛</text>
545 538 </view>
546   - <view>
  539 + <view class="mr20">
547 540 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
548 541 <text class="fs26">皮脂腺分泌旺盛</text>
549 542 </view>
... ... @@ -629,8 +622,46 @@
629 622 </view>
630 623 </scroll-view>
631 624  
632   -<view class="mask" wx:if="{{showDialog}}"></view>
  625 +<view class="mask" catchtap="close_mask" wx:if="{{showDialog}}"></view>
633 626 <cover-view class="share fs28">
634   - <text class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></text>
635   - <text>分享</text>
636   -</cover-view>
637 627 \ No newline at end of file
  628 + <cover-view class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></cover-view>
  629 + <cover-view>分享</cover-view>
  630 +</cover-view>
  631 +
  632 +<view class="dialog" wx:if="{{showDialog}}">
  633 + <block wx:if="{{img_scale}}">
  634 + <view class="dialog_img">
  635 + <view style="height: 100%;">
  636 + <image src="../../../images/1.jpg" style="width: 100%;height: 100%;"></image>
  637 + </view>
  638 + <view class="dialog_icon" catchtap="close_dialog" style="justify-content: flex-start;">
  639 + <text class="iconfont icon-guan mt20" style="z-index: 999;font-size: 20rpx;"></text>
  640 + </view>
  641 + <view class="dialog_icon">
  642 + <text catchtap="click_yanjing" class="iconfont {{yanjing?'icon-yanjing-kai':'icon-yanjing-guan'}} mgb20"></text>
  643 + <!-- <text class="iconfont icon-yanjing-guan mgb20"></text> -->
  644 + <text catchtap="click_fangda" class="iconfont icon-fangda mgb20"></text>
  645 + </view>
  646 + </view>
  647 + <view class="dialog_txt">
  648 + <view class="fs28" style="margin-right:15rpx;">毛孔较粗大</view>
  649 + <view style="margin-top:2rpx;display: flex;">
  650 + <view class="pp"></view>
  651 + <view class="pp"></view>
  652 + <view class="pp"></view>
  653 + <view class="pp"></view>
  654 + <view class="pp"></view>
  655 + <view class="pp"></view>
  656 + <view class="pp"></view>
  657 + <view class="pp"></view>
  658 + <view class="pp"></view>
  659 + </view>
  660 + </view>
  661 + </block>
  662 + <block wx:else>
  663 + <image style="width: 100%;height: 100%;" src="../../../images/1.jpg"></image>
  664 + <view class="dialog_icon">
  665 + <text catchtap="click_fangda" class="iconfont icon-suoxiao mgb20"></text>
  666 + </view>
  667 + </block>
  668 +</view>
638 669 \ No newline at end of file
... ...
packageB/pages/AI-test-skin/success_result/success_result.wxss
  View file @d2a1ee8
... ... @@ -11,16 +11,18 @@ page {
11 11 display: flex;
12 12 height: 100rpx;
13 13 }
  14 +
14 15 .share {
  16 + display: flex;
15 17 position: fixed;
16 18 bottom: 100rpx;
17 19 right: 0;
18   - padding: 20rpx;
19   - background-color: #fff;
20   - border: 2rpx solid #f0f0f0;
21   - /* color: #FFF; */
22   - border-radius: 40rpx 0 0 40rpx;
23   - z-index: 99;
  20 + padding: 20rpx;
  21 + background-color: #fff;
  22 + border: 2rpx solid #f0f0f0;
  23 + /* color: #FFF; */
  24 + border-radius: 40rpx 0 0 40rpx;
  25 + z-index: 99;
24 26 }
25 27  
26 28 .tab_scroll_item {
... ... @@ -110,14 +112,16 @@ page {
110 112 width: 100%;
111 113 height: 100%;
112 114 top: 0;
113   - bottom: 0;
114   - left: 0;
115   - right: 0;
  115 + bottom: 0;
  116 + left: 0;
  117 + right: 0;
116 118 background-color: rgba(0, 0, 0, .6);
117 119 }
  120 +
118 121 .ll::after {
119 122 content: "\e650";
120 123 }
  124 +
121 125 .analyse .analyse_center image {
122 126 height: 100%;
123 127 width: 100%;
... ... @@ -186,6 +190,9 @@ page {
186 190 margin-left: 20rpx;
187 191 }
188 192  
  193 +.mr10 {
  194 + margin-right: 10rpx;
  195 +}
189 196 .mr20 {
190 197 margin-right: 20rpx;
191 198 }
... ... @@ -364,4 +371,56 @@ page {
364 371 /* width: 160rpx; */
365 372 flex-direction: column;
366 373 align-items: center;
367   -}
368 374 \ No newline at end of file
  375 +}
  376 +
  377 +.dialog {
  378 + position: fixed;
  379 + top: 50%;
  380 + right: 50%;
  381 + transform: translate(50%, -50%);
  382 + height: 70%;
  383 + width: 80%;
  384 + border-radius: 30rpx;
  385 +}
  386 +
  387 +.dialog .dialog_img {
  388 + height: 80%;
  389 + position: relative;
  390 +}
  391 +
  392 +.dialog .dialog_txt {
  393 + height: 20%;
  394 + display: flex;
  395 + align-items: center;
  396 + justify-content: center;
  397 + background-color: #fff;
  398 +}
  399 +
  400 +.dialog .dialog_icon {
  401 + position: absolute;
  402 + right: 30rpx;
  403 + top: 0;
  404 + display: flex;
  405 + flex-direction: column;
  406 + justify-content: flex-end;
  407 + height: 100%;
  408 +}
  409 +
  410 +.dialog .iconfont {
  411 + display: flex;
  412 + justify-content: center;
  413 + align-items: center;
  414 + color: #fff;
  415 + background-color: #1f1919;
  416 + border-radius: 50%;
  417 + width: 50rpx;
  418 + height: 50rpx;
  419 +}
  420 +
  421 +.pp {
  422 + width: 8rpx;
  423 + height: 35rpx;
  424 + margin-right: 5rpx;
  425 + border-radius: 3rpx;
  426 + background: #2cb344;
  427 +}
... ...
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
  View file @d2a1ee8
... ... @@ -1425,16 +1425,16 @@ Page({
1425 1425 if (by_qc.region_list != "" && by_qc.region_list != null && by_qc.region_list != undefined) {
1426 1426 if (th.check_by_area(by_qc.region_list)) {
1427 1427 freight_free = 0;
1428   - goods_weight = -1;
1429   - out_of_weight = 0;
  1428 + // goods_weight = -1;
  1429 + // out_of_weight = 0;
1430 1430 th.data.is_no_by[pickid] = 1;
1431 1431 }
1432 1432 }
1433 1433 //如果有设置不包邮区商品
1434 1434 if (by_qc.goods_list != "" && by_qc.goods_list != undefined && by_qc != null && freight_free > 0) {
1435 1435 freight_free = 0;
1436   - goods_weight = -1;
1437   - out_of_weight = 0;
  1436 + // goods_weight = -1;
  1437 + // out_of_weight = 0;
1438 1438 th.data.is_no_by[pickid] = 1;
1439 1439 no_ex_good = by_qc.goods_list;
1440 1440 }
... ... @@ -1902,7 +1902,7 @@ Page({
1902 1902 if (res.data.data[0].region_list) {
1903 1903 if (th.check_by_area(res.data.data[0].region_list)) {
1904 1904 freight_free = 0;
1905   - out_of_weight = 0;
  1905 + // out_of_weight = 0;
1906 1906 th.data.is_no_by[th.data.bn_pick] = 1;
1907 1907 }
1908 1908 }
... ... @@ -1910,7 +1910,7 @@ Page({
1910 1910 if (res.data.data[0].goods_list && freight_free) {
1911 1911 if (th.check_by_goods(res.data.data[0].goods_list)) {
1912 1912 freight_free = 0;
1913   - out_of_weight = 0;
  1913 + // out_of_weight = 0;
1914 1914 th.data.is_no_by[th.data.bn_pick] = 1;
1915 1915 }
1916 1916 }
... ... @@ -3798,7 +3798,7 @@ Page({
3798 3798 if (no_by_data && no_by_data.region_list) {
3799 3799 if (th.check_by_area(no_by_data.region_list)) {
3800 3800 gift_freight_free = 0;
3801   - out_of_weight = 0;
  3801 + // out_of_weight = 0;
3802 3802 th.data.is_no_by[th.data.bn_pick] = 1;
3803 3803 }
3804 3804 }
... ... @@ -3806,7 +3806,7 @@ Page({
3806 3806 if (no_by_data && no_by_data.goods_list && gift_freight_free) {
3807 3807 if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) {
3808 3808 gift_freight_free = 0;
3809   - out_of_weight = 0;
  3809 + // out_of_weight = 0;
3810 3810 th.data.is_no_by[th.data.bn_pick] = 1;
3811 3811 //th.data.is_no_by[th.data.bn_pick]=1;
3812 3812 }
... ...
packageC/pages/presell/cart/cart2.js
  View file @d2a1ee8
... ... @@ -713,8 +713,8 @@ Page({
713 713 if (res.data.data[0].region_list) {
714 714 if (th.check_by_area(res.data.data[0].region_list)) {
715 715 freight_free = 0;
716   - out_of_weight = 0;
717   - weight_free=-1;
  716 + // out_of_weight = 0;
  717 + // weight_free=-1;
718 718 th.data.is_no_by[th.data.bn_pick] = 1;
719 719 }
720 720 }
... ... @@ -722,8 +722,8 @@ Page({
722 722 if (res.data.data[0].goods_list && freight_free) {
723 723 if (th.check_by_goods(res.data.data[0].goods_list)) {
724 724 freight_free = 0;
725   - out_of_weight = 0;
726   - weight_free=-1;
  725 + // out_of_weight = 0;
  726 + // weight_free=-1;
727 727 th.data.is_no_by[th.data.bn_pick] = 1;
728 728 }
729 729 }
... ... @@ -2585,7 +2585,7 @@ Page({
2585 2585 if (no_by_data && no_by_data.region_list) {
2586 2586 if (th.check_by_area(no_by_data.region_list)) {
2587 2587 gift_freight_free = 0;
2588   - out_of_weight = 0;
  2588 + // out_of_weight = 0;
2589 2589 th.data.is_no_by[th.data.bn_pick] = 1;
2590 2590 }
2591 2591 }
... ... @@ -2593,7 +2593,7 @@ Page({
2593 2593 if (no_by_data && no_by_data.goods_list && gift_freight_free) {
2594 2594 if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) {
2595 2595 gift_freight_free = 0;
2596   - out_of_weight = 0;
  2596 + // out_of_weight = 0;
2597 2597 th.data.is_no_by[th.data.bn_pick]=1;
2598 2598 }
2599 2599 }
... ...
pages/cart/cart2/cart2.js
  View file @d2a1ee8
... ... @@ -1566,16 +1566,16 @@ Page({
1566 1566 if (by_qc.region_list != "" && by_qc.region_list != null && by_qc.region_list != undefined) {
1567 1567 if (th.check_by_area(by_qc.region_list)) {
1568 1568 freight_free = 0;
1569   - goods_weight = -1;
1570   - out_of_weight = 0;
  1569 + //goods_weight = -1;
  1570 + //out_of_weight = 0;
1571 1571 th.data.is_no_by[pickid] = 1;
1572 1572 }
1573 1573 }
1574 1574 //如果有设置不包邮区商品
1575 1575 if (by_qc.goods_list != "" && by_qc.goods_list != undefined && by_qc != null && freight_free > 0) {
1576 1576 freight_free = 0;
1577   - goods_weight = -1;
1578   - out_of_weight = 0;
  1577 + //goods_weight = -1;
  1578 + //out_of_weight = 0;
1579 1579 th.data.is_no_by[pickid] = 1;
1580 1580 no_ex_good = by_qc.goods_list;
1581 1581 }
... ... @@ -2056,7 +2056,7 @@ Page({
2056 2056 if (res.data.data[0].region_list) {
2057 2057 if (th.check_by_area(res.data.data[0].region_list)) {
2058 2058 freight_free = 0;
2059   - out_of_weight = 0;
  2059 + // out_of_weight = 0;
2060 2060 th.data.is_no_by[th.data.bn_pick] = 1;
2061 2061 }
2062 2062 }
... ... @@ -2064,7 +2064,7 @@ Page({
2064 2064 if (res.data.data[0].goods_list && freight_free) {
2065 2065 if (th.check_by_goods(res.data.data[0].goods_list)) {
2066 2066 freight_free = 0;
2067   - out_of_weight = 0;
  2067 + // out_of_weight = 0;
2068 2068 th.data.is_no_by[th.data.bn_pick] = 1;
2069 2069 }
2070 2070 }
... ... @@ -4090,7 +4090,7 @@ Page({
4090 4090 if (no_by_data && no_by_data.region_list) {
4091 4091 if (th.check_by_area(no_by_data.region_list)) {
4092 4092 gift_freight_free = 0;
4093   - out_of_weight = 0
  4093 + // out_of_weight = 0
4094 4094 th.data.is_no_by[th.data.bn_pick] = 1;
4095 4095 }
4096 4096 }
... ... @@ -4098,7 +4098,7 @@ Page({
4098 4098 if (no_by_data && no_by_data.goods_list && gift_freight_free) {
4099 4099 if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) {
4100 4100 gift_freight_free = 0;
4101   - out_of_weight = 0
  4101 + // out_of_weight = 0
4102 4102 th.data.is_no_by[th.data.bn_pick]=1;
4103 4103 }
4104 4104 }
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @d2a1ee8
... ... @@ -484,8 +484,8 @@ Page({
484 484 if (res.data.data[0].region_list) {
485 485 if (th.check_by_area(res.data.data[0].region_list)) {
486 486 freight_free = 0;
487   - out_of_weight = 0;
488   - weight_free = -1;
  487 + // out_of_weight = 0;
  488 + // weight_free = -1;
489 489 th.data.is_no_by[th.data.bn_pick] = 1;
490 490 }
491 491 }
... ... @@ -493,8 +493,8 @@ Page({
493 493 if (res.data.data[0].goods_list && freight_free) {
494 494 if (th.check_by_goods(res.data.data[0].goods_list)) {
495 495 freight_free = 0;
496   - out_of_weight = 0;
497   - weight_free = -1;
  496 + // out_of_weight = 0;
  497 + // weight_free = -1;
498 498 th.data.is_no_by[th.data.bn_pick] = 1;
499 499 }
500 500 }
... ...