From 0d0b154b4cfb474db6f8364593f9b2693b050df2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 24 Feb 2022 09:40:40 +0800
Subject: [PATCH] 测肤问题的细节调整

---
 packageD/pages/AI-test-skin/success_result/acne/acne.js             |  20 ++++++++++----------
 packageD/pages/AI-test-skin/success_result/acne/acne.wxml           |   8 ++++----
 packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js   |  18 ++++++++----------
 packageD/pages/AI-test-skin/success_result/blackhead/blackhead.wxml |   8 ++++----
 packageD/pages/AI-test-skin/success_result/coupon.wxml              |   5 ++++-
 packageD/pages/AI-test-skin/success_result/dark/dark.js             |  21 ++++++++++-----------
 packageD/pages/AI-test-skin/success_result/dark/dark.wxml           |   6 +++---
 packageD/pages/AI-test-skin/success_result/pore/pore.js             |  12 ++++++++++--
 packageD/pages/AI-test-skin/success_result/pore/pore.wxml           |   8 ++++----
 packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js   |  19 +++++++++----------
 packageD/pages/AI-test-skin/success_result/sensitive/sensitive.wxml |  20 ++++++++++----------
 packageD/pages/AI-test-skin/success_result/speckle/speckle.js       |  19 +++++++++----------
 packageD/pages/AI-test-skin/success_result/speckle/speckle.wxml     |   8 ++++----
 packageD/pages/AI-test-skin/success_result/success_result.js        | 441 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
 packageD/pages/AI-test-skin/success_result/success_result.json      |   2 ++
 packageD/pages/AI-test-skin/success_result/success_result.wxml      |  63 ++++++++++++++++++++++-----------------------------------------
 packageD/pages/AI-test-skin/success_result/success_result.wxss      |  24 ++++++++++++++++++++----
 packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js       |  19 +++++++++----------
 packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml     |   8 ++++----
 19 files changed, 549 insertions(+), 180 deletions(-)

diff --git a/packageD/pages/AI-test-skin/success_result/acne/acne.js b/packageD/pages/AI-test-skin/success_result/acne/acne.js
index bbf38ae..30c043e 100644
--- a/packageD/pages/AI-test-skin/success_result/acne/acne.js
+++ b/packageD/pages/AI-test-skin/success_result/acne/acne.js
@@ -1,14 +1,7 @@
-/*
- * @Author: abson
- * @Date: 2022-02-21 11:03:07
- * @LastEditTime: 2022-02-21 17:50:35
- * @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\acne\acne.js
- */
 module.exports = {
 	//把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
-	get_goods: function(th,stoid) {
+	get_goods: function(th,stoid,sort) {
+	    th.setData({acne_sort:sort});
         var r_code='03';
         //获取痘痘的类型
         var list=th.data.face_data.acnespotmole.acne_list;
@@ -42,9 +35,16 @@ module.exports = {
          var  url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2";
          getApp().request.promiseGet(url, {}).then(res=>{
            if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-               th.setData({acne_quan_list:res.data.data.pageData});
+               var arr=res.data.data.pageData;
+               arr.map(function (e) {
+                   e.q_word='acne_quan_list';
+                   return e;
+               })
+               th.setData({acne_quan_list:arr});
            }
          })
 
+
+
 	},
 }
diff --git a/packageD/pages/AI-test-skin/success_result/acne/acne.wxml b/packageD/pages/AI-test-skin/success_result/acne/acne.wxml
index d437250..e03ac39 100644
--- a/packageD/pages/AI-test-skin/success_result/acne/acne.wxml
+++ b/packageD/pages/AI-test-skin/success_result/acne/acne.wxml
@@ -2,7 +2,7 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#06</view>
+                <view style="color: #45d4eb;">#0{{acne_sort}}</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">痤疮</text>
                     <view class="fs26" catchtap="show_dailog" data-type="6" style="display: flex;align-items: center;">
@@ -18,10 +18,10 @@
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
-                    <view class="bold">I级</view>
+                    <view class="bold">痤疮数{{acne_num}}个</view>
                 </view>
             </view>
-            <view class="analyse_classify_header_item" style="margin-top:5%">
+            <view class="analyse_classify_header_item" style="margin-top:5%;display: none">
                 <view class="analyse_classify_header_img">
                     <image src="{{iurl}}/miniapp/images/skinimg/cuochuang_icon.jpg"></image>
                 </view>
@@ -125,7 +125,7 @@
         <!-- 优惠券 -->
         <view wx:if="{{acne_quan_list}}">
             <view style="margin:5% 0">适合痤疮商品的优惠券</view>
-            <view class="xc-coupon-frame rel">
+            <view class="xc-coupon-frame">
                 <block wx:for="{{acne_quan_list}}">
                     <include src="../coupon.wxml" />
                 </block>
diff --git a/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js b/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js
index 85f3c20..3d31a69 100644
--- a/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js
+++ b/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.js
@@ -1,14 +1,7 @@
-/*
- * @Author: abson
- * @Date: 2022-02-21 11:03:07
- * @LastEditTime: 2022-02-21 17:48:28
- * @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\blackhead\blackhead.js
- */
 module.exports = {
 	//把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
-	get_goods: function(th,stoid) {
+	get_goods: function(th,stoid,sort) {
+	    th.setData({backhead_sort:sort});
 	    var r_code='10';
 	    //获取黑头的类型
         var blackhead_segs_type=th.data.face_data.blackheadpore.blackhead_segs_type;
@@ -37,7 +30,12 @@ module.exports = {
          var  url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2";
          getApp().request.promiseGet(url, {}).then(res=>{
            if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-               th.setData({blackhead_quan_list:res.data.data.pageData});
+               var arr=res.data.data.pageData;
+               arr.map(function (e) {
+                   e.q_word='blackhead_quan_list';
+                   return e;
+               })
+               th.setData({blackhead_quan_list:arr});
            }
          })
 
diff --git a/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.wxml b/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.wxml
index 90855ec..68d7587 100644
--- a/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.wxml
+++ b/packageD/pages/AI-test-skin/success_result/blackhead/blackhead.wxml
@@ -2,7 +2,7 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#01</view>
+                <view style="color: #45d4eb;">#0{{backhead_sort}}</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">黑头</text>
                     <view class="fs26" catchtap="show_dailog" data-type="4" style="display: flex;align-items: center;">
@@ -17,10 +17,10 @@
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
-                    <view class="bold">待确定</view>
+                    <view class="bold">黑头数{{blackhead_num}}个</view>
                 </view>
             </view>
-            <view class="analyse_classify_header_item mt_b5">
+            <view class="analyse_classify_header_item mt_b5" style="display: none">
                 <view class="analyse_classify_header_img">
                     <image src="{{iurl}}/miniapp/images/skinimg/heitou_icon.jpg"></image>
                 </view>
@@ -95,7 +95,7 @@
         <!-- 优惠券 -->
         <view wx:if="{{blackhead_quan_list}}">
             <view style="margin:5% 0">适合黑头商品的优惠券</view>
-            <view class="xc-coupon-frame rel">
+            <view class="xc-coupon-frame">
                 <block wx:for="{{blackhead_quan_list}}">
                     <include src="../coupon.wxml" />
                 </block>
diff --git a/packageD/pages/AI-test-skin/success_result/coupon.wxml b/packageD/pages/AI-test-skin/success_result/coupon.wxml
index 7e8f042..e2ee4cb 100644
--- a/packageD/pages/AI-test-skin/success_result/coupon.wxml
+++ b/packageD/pages/AI-test-skin/success_result/coupon.wxml
@@ -1,4 +1,5 @@
 <!-- -单张的券- -->
+<view class="rel">
 <view class="coupon flex">
     <view class="circle xc-circular-one"></view>
     <view class="xc-coupon-left ">
@@ -16,10 +17,12 @@
             </view>
         </view>
         <view class="flex-vertical">
-            <view class="three-level-word xc-get background  {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}" data-ind="{{index}}" data-cid="{{item.id}}" bindtap="get_quan">
+            <view class="three-level-word xc-get background  {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}"
+                  data-ind="{{index}}" data-cid="{{item.id}}" data-word="{{item.q_word}}" bindtap="get_quan">
                 {{ item.linging==1?'领取中':'领取'}}
             </view>
         </view>
     </view>
     <view class="circle xc-circular-two"></view>
+</view>
 </view>
\ No newline at end of file
diff --git a/packageD/pages/AI-test-skin/success_result/dark/dark.js b/packageD/pages/AI-test-skin/success_result/dark/dark.js
index 44b78fc..9cebafa 100644
--- a/packageD/pages/AI-test-skin/success_result/dark/dark.js
+++ b/packageD/pages/AI-test-skin/success_result/dark/dark.js
@@ -1,16 +1,10 @@
-/*
- * @Author: abson
- * @Date: 2022-02-21 11:03:07
- * @LastEditTime: 2022-02-21 17:50:16
- * @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\dark\dark.js
- */
 module.exports = {
 	//把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
-	get_goods: function(th,stoid) {
-        var r_code='08';
+	get_goods: function(th,stoid,sort) {
+
+        th.setData({dark_sort:sort});
 
+        var r_code='08';
         var arr1=th.data.face_data.eyesattr.dark_circle_left_type;
         var arr2=th.data.face_data.eyesattr.dark_circle_right_type;
         var arr=[...arr1,...arr2];
@@ -40,7 +34,12 @@ module.exports = {
          var  url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2";
          getApp().request.promiseGet(url, {}).then(res=>{
            if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-               th.setData({dark_quan_list:res.data.data.pageData});
+               var arr=res.data.data.pageData;
+               arr.map(function (e) {
+                   e.q_word='dark_quan_list';
+                   return e;
+               })
+               th.setData({dark_quan_list:arr});
            }
          })
 	},
diff --git a/packageD/pages/AI-test-skin/success_result/dark/dark.wxml b/packageD/pages/AI-test-skin/success_result/dark/dark.wxml
index 226e52c..f2fa44a 100644
--- a/packageD/pages/AI-test-skin/success_result/dark/dark.wxml
+++ b/packageD/pages/AI-test-skin/success_result/dark/dark.wxml
@@ -2,7 +2,7 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#05</view>
+                <view style="color: #45d4eb;">#0{{dark_sort}}</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">黑眼圈</text>
                     <view class="fs26" catchtap="show_dailog" data-type="5" style="display: flex;align-items: center;">
@@ -72,7 +72,7 @@
                 </block>
             </view>
             <view class="fs28 mt_b10">
-                <text>明显可见毛孔或内含小于毛孔大小角栓</text>
+                <text>隐约可见黑眼圈</text>
             </view>
         </view>
         <view class="analyse_classify_body">
@@ -131,7 +131,7 @@
         <!-- 优惠券 -->
         <view wx:if="{{dark_quan_list}}">
             <view style="margin:5% 0">适合黑眼圈商品的优惠券</view>
-            <view class="xc-coupon-frame rel">
+            <view class="xc-coupon-frame">
                 <block wx:for="{{dark_quan_list}}">
                     <include src="../coupon.wxml" />
                 </block>
diff --git a/packageD/pages/AI-test-skin/success_result/pore/pore.js b/packageD/pages/AI-test-skin/success_result/pore/pore.js
index 0ca81e3..92609e4 100644
--- a/packageD/pages/AI-test-skin/success_result/pore/pore.js
+++ b/packageD/pages/AI-test-skin/success_result/pore/pore.js
@@ -1,6 +1,9 @@
 module.exports = {
 	//把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
-	get_goods: function(th,stoid) {
+	get_goods: function(th,stoid,sort) {
+
+        th.setData({port_sort:sort})
+
         var r_code='11';
 	    //获取毛孔的类型
         var pore_segs_type=th.data.face_data.blackheadpore.pore_segs_type;
@@ -29,7 +32,12 @@ module.exports = {
         var  url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2";
 		getApp().request.promiseGet(url, {}).then(res=>{
           if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-              th.setData({pore_quan_list:res.data.data.pageData});
+              var arr=res.data.data.pageData;
+              arr.map(function (e) {
+                  e.q_word='pore_quan_list';
+                  return e;
+              })
+              th.setData({pore_quan_list:arr});
           }
         })
 	},
diff --git a/packageD/pages/AI-test-skin/success_result/pore/pore.wxml b/packageD/pages/AI-test-skin/success_result/pore/pore.wxml
index e8a7114..31c81bb 100644
--- a/packageD/pages/AI-test-skin/success_result/pore/pore.wxml
+++ b/packageD/pages/AI-test-skin/success_result/pore/pore.wxml
@@ -2,7 +2,7 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#01</view>
+                <view style="color: #45d4eb;">#0{{port_sort}}</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">毛孔</text>
                     <view class="fs26" catchtap="show_dailog" data-type="1" style="display: flex;align-items: center;">
@@ -17,10 +17,10 @@
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
-                    <view class="bold">待确定</view>
+                    <view class="bold">毛孔粗大数{{pore_num}}个</view>
                 </view>
             </view>
-            <view class="analyse_classify_header_item mt_b5">
+            <view class="analyse_classify_header_item mt_b5" style="display: none">
                 <view class="analyse_classify_header_img">
                     <image src="{{iurl}}/miniapp/images/skinimg/maokong_icon.jpg"></image>
                 </view>
@@ -96,7 +96,7 @@
         <!-- 优惠券 -->
         <view wx:if="{{pore_quan_list}}">
             <view style="margin:5% 0">适合毛孔商品的优惠券</view>
-            <view class="xc-coupon-frame rel">
+            <view class="xc-coupon-frame">
                 <block wx:for="{{pore_quan_list}}">
                     <include src="../coupon.wxml" />
                 </block>
diff --git a/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js b/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js
index 96734b3..0aa0c90 100644
--- a/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js
+++ b/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.js
@@ -1,14 +1,8 @@
-/*
- * @Author: abson
- * @Date: 2022-02-21 17:42:05
- * @LastEditTime: 2022-02-21 17:50:54
- * @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\sensitive\sensitive.js
- */
 module.exports = {
     //把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
-    get_goods: function (th, stoid) {
+    get_goods: function (th, stoid,sort) {
+        th.setData({sensitive_sort:sort});
+
         var r_code = '12';
         //获取毛孔的类型
         var arr = th.data.face_data.skinquality.skin_sensitive_check;
@@ -36,7 +30,12 @@ module.exports = {
         var url = "/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code=" + r_code + "&store_id=" + stoid + "&recommend_word=" + re_word + "&pageSize=2";
         getApp().request.promiseGet(url, {}).then(res => {
             if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
-                th.setData({sensitive_quan_list: res.data.data.pageData });
+                var arr=res.data.data.pageData;
+                arr.map(function (e) {
+                    e.q_word='sensitive_quan_list';
+                    return e;
+                })
+                th.setData({sensitive_quan_list: arr});
             }
         })
     },
diff --git a/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.wxml b/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.wxml
index b5af813..8982a5e 100644
--- a/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.wxml
+++ b/packageD/pages/AI-test-skin/success_result/sensitive/sensitive.wxml
@@ -2,7 +2,7 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#07</view>
+                <view style="color: #45d4eb;">#0{{sensitive_sort}}</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">敏感度</text>
                     <view class="fs26" catchtap="show_dailog" data-type="7" style="display: flex;align-items: center;">
@@ -20,7 +20,7 @@
                     <view class="bold">{{s_filter.get_nai_shou(skin_sensitive_check)}}</view>
                 </view>
             </view>
-            <view class="analyse_classify_header_item mt_b5">
+            <view class="analyse_classify_header_item mt_b5" style="display: none">
                 <view class="analyse_classify_header_img">
                     <image src="{{iurl}}/miniapp/images/skinimg/mingandu_icon.jpg"></image>
                 </view>
@@ -29,7 +29,7 @@
                     <view class="bold">待确定</view>
                 </view>
             </view>
-            <view class="fs28 mt_b10">
+            <view class="fs28 mt_b10" style="display: none">
                 <text>明显可见毛孔或内含小于毛孔大小角栓</text>
             </view>
         </view>
@@ -56,16 +56,16 @@
                 <view class="fenxi mgb10">护理建议</view>
                 <view class="">
                     <view class="mgb30">
-                        <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">01</text> 日常防晒</text>
-                        <view class="fs26 c_666">用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根使用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根大股东是公司山豆根山豆根收到二十个的山豆根山豆根</view>
+                        <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">01</text>做好防晒</text>
+                        <view class="fs26 c_666">采用打伞、戴帽等物理防晒措施，肌肤稳定后再适当使用轻薄的无机防晒霜,并使用温和的卸妆产品后再进行洁面。</view>
                     </view>
                     <view class="mgb30">
-                        <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">02</text> 补水保湿</text>
-                        <view class="fs26 c_666">用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根使用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根大股东是公司山豆根山豆根收到二十个的山豆根山豆根</view>
+                        <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">02</text>抗敏护肤</text>
+                        <view class="fs26 c_666">护肤品越简单越好，选择不含香精、酒精、防腐剂或具有修复皮肤屏障功能的产品，并减少化妆次数。</view>
                     </view>
                     <view class="mgb30">
-                        <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">03</text> 早晚清洁</text>
-                        <view class="fs26 c_666">用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根使用的公司大股东是公司山豆根山豆根收到二十个的山豆根山豆根大股东是公司山豆根山豆根收到二十个的山豆根山豆根</view>
+                        <text style="font-size: 28rpx;margin-right: 10rpx;"><text class="bold">03</text>温和清洁</text>
+                        <view class="fs26 c_666">尽量使用清水进行洁面,温水尤佳。或使用温和洗面奶在T区进行局部洁面，严禁深度清洁或去角质。</view>
                     </view>
                 </view>
             </view>
@@ -92,7 +92,7 @@
         <!-- 优惠券 -->
         <view wx:if="{{sensitive_quan_list}}">
             <view style="margin:5% 0">适合敏感度商品的优惠券</view>
-            <view class="xc-coupon-frame rel">
+            <view class="xc-coupon-frame">
                 <block wx:for="{{sensitive_quan_list}}">
                     <include src="../coupon.wxml" />
                 </block>
diff --git a/packageD/pages/AI-test-skin/success_result/speckle/speckle.js b/packageD/pages/AI-test-skin/success_result/speckle/speckle.js
index 3f8b134..2adfa99 100644
--- a/packageD/pages/AI-test-skin/success_result/speckle/speckle.js
+++ b/packageD/pages/AI-test-skin/success_result/speckle/speckle.js
@@ -1,14 +1,8 @@
-/*
- * @Author: abson
- * @Date: 2022-02-21 11:03:07
- * @LastEditTime: 2022-02-21 17:48:51
- * @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\speckle\speckle.js
- */
 module.exports = {
 	//把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
-	get_goods: function(th,stoid) {
+	get_goods: function(th,stoid,sort) {
+        th.setData({speckle_sort:sort});
+
         var r_code='07';
 	    //获取斑的类型
         var list=th.data.face_data.acnespotmole.speckle_list;
@@ -42,7 +36,12 @@ module.exports = {
          var  url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2";
          getApp().request.promiseGet(url, {}).then(res=>{
            if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-               th.setData({speckle_quan_list:res.data.data.pageData});
+               var arr=res.data.data.pageData;
+               arr.map(function (e) {
+                   e.q_word='speckle_quan_list';
+                   return e;
+               })
+               th.setData({speckle_quan_list:arr});
            }
          })
 
diff --git a/packageD/pages/AI-test-skin/success_result/speckle/speckle.wxml b/packageD/pages/AI-test-skin/success_result/speckle/speckle.wxml
index 8073949..23aa0e0 100644
--- a/packageD/pages/AI-test-skin/success_result/speckle/speckle.wxml
+++ b/packageD/pages/AI-test-skin/success_result/speckle/speckle.wxml
@@ -2,7 +2,7 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#02</view>
+                <view style="color: #45d4eb;">#0{{speckle_sort}}</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">色斑</text>
                     <view class="fs26" catchtap="show_dailog" data-type="2" style="display: flex;align-items: center;">
@@ -17,10 +17,10 @@
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
-                    <view class="bold">待确定</view>
+                    <view class="bold">色斑数{{speckle_num}}个</view>
                 </view>
             </view>
-            <view class="analyse_classify_header_item mt_b5">
+            <view class="analyse_classify_header_item mt_b5" style="display: none">
                 <view class="analyse_classify_header_img">
                     <image src="{{iurl}}/miniapp/images/skinimg/seban_icon.jpg"></image>
                 </view>
@@ -92,7 +92,7 @@
         <!-- 优惠券 -->
         <view wx:if="{{speckle_quan_list}}">
             <view style="margin:5% 0">适合色斑商品的优惠券</view>
-            <view class="xc-coupon-frame rel">
+            <view class="xc-coupon-frame">
                 <block wx:for="{{speckle_quan_list}}">
                     <include src="../coupon.wxml" />
                 </block>
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 8d68cfd..9774c46 100644
--- a/packageD/pages/AI-test-skin/success_result/success_result.js
+++ b/packageD/pages/AI-test-skin/success_result/success_result.js
@@ -34,13 +34,14 @@ Page({
 
         img_scale_icon:true,
         show_problem:1, //问题标注显示问题
-        img_scale:1, //缩放问题
+        ig_scale:1, //缩放问题
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+
         var th = this;
         //初始化一下，获取商品的价格
         this.init();
@@ -91,26 +92,32 @@ Page({
                 face_img: img,
                 m_top: (location.top - location.height / 2.5) * th.data.bili,
                 m_left: (location.left - location.width / 7) * th.data.bili,
-                bili: th.data.bili
+                bili: th.data.bili,
+                sex:sex
             })
+            var sort=1;
             //-- 调用毛孔的推荐函数 --
             if (pore_num > 0)
-                pore.get_goods(th, setting.stoid);
+                pore.get_goods(th, setting.stoid,sort++);
             //-- 调用黑头的推荐函数 --
             if (blackhead_num > 0)
-                blackhead.get_goods(th, setting.stoid);
+                blackhead.get_goods(th, setting.stoid,sort++);
             //-- 调用色斑的推荐函数 --
             if (speckle_num > 0)
-                speckle.get_goods(th, setting.stoid);
+                speckle.get_goods(th, setting.stoid,sort++);
             //-- 调用皱纹的推荐函数 --
             if (wrinkle_num > 0)
-                wrinkle.get_goods(th, setting.stoid);
+                wrinkle.get_goods(th, setting.stoid,sort++);
             //-- 黑眼圈 --
             if (dark_type > -1)
-                dark.get_goods(th, setting.stoid);
+                dark.get_goods(th, setting.stoid,sort++);
             //-- 黑眼圈 --
             if (acne_num > -0)
-                acne.get_goods(th, setting.stoid);
+                acne.get_goods(th, setting.stoid,sort++);
+
+            //获取一下分享要用的图片
+            th.set_share_img();
+
         })
     },
 
@@ -183,24 +190,23 @@ Page({
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
-    onReady: function () {
-        // let heightRecords = [];
-        // setTimeout(() => {
-        //     for (let i = 0; i < this.data.tab.length; i++) {
-        //         let item = this.data.tab[i];
-        //         let id = `#${item.id}`;
-        //         let query = wx.createSelectorQuery();
-        //         query.select(id).boundingClientRect(rect => {
-        //             console.log(rect, i);
-        //             heightRecords[i] = rect.height;
-        //         }).exec()
-        //     }
-        //     this.setData({
-        //         heightRecords,
-        //     })
-        // }, 1000)
+    onReady: function () {},
+    set_share_img:function () {
+        var th=this;
+        var path3=th.data.iurl+"/miniapp/images/skinimg/nan.png";
+        if(this.data.sex=='female')
+            path3=th.data.iurl+"/miniapp/images/skinimg/nv.png";
+        // 读取文件成功则OK--
+        wx.getImageInfo({
+            src: path3,
+            success: function (res) {
+                //获取到二维码的图片
+                th.data.share_head=res.path;
+            }
+        })
 
     },
+
     binddragend(e) {
         console.log(e);
         this.setData({
@@ -364,14 +370,6 @@ Page({
         })
     },
 
-    click_share(){
-        this.setData({
-            share_flag:true,
-            img_scale:false,
-            showDialog:true,
-        })
-    },
-
     //图片加载的时候，计算图片的像素大小
     face_img_load: function (e) {
         var th = this;
@@ -389,6 +387,7 @@ Page({
 
     //-- 图片的拖拽缩放的功能 --
     touchstartCallback: function(e) {
+        this.data.tc_end=0;
         // 单手指缩放开始，也不做任何处理
         if(e.touches.length>1) {
             // 一开始我并没有这个回调函数，会出现缩小的时候有瞬间被放大过程的bug
@@ -404,6 +403,7 @@ Page({
 
     },
     touchmoveCallback: function(e) {
+            if(this.data.tc_end) return false;
             // 单手指缩放我们不做任何操作
             if(e.touches.length > 1){
                 let xMove = e.touches[1].clientX - e.touches[0].clientX;
@@ -412,7 +412,7 @@ Page({
                 let distance = Math.sqrt(xMove * xMove + yMove * yMove);
                 let distanceDiff = distance - this.data.img_distance;
 
-                let newScale = this.data.img_scale + 0.005 * distanceDiff
+                let newScale = this.data.ig_scale + 0.005 * distanceDiff
                 // 为了防止缩放得太大，所以scale需要限制，同理最小值也是
                 if(newScale >= 2) {
                     newScale = 2
@@ -424,21 +424,386 @@ Page({
                 this.data.img_distance=distance;
                 // 赋值 新的 => 旧的
                 this.setData({
-                    'img_scale': newScale,
+                    'ig_scale': newScale,
                 })
             }else if(e.touches.length==1){
                 let xMove= e.touches[0].clientX- this.data.img_x;
                 let yMove= e.touches[0].clientY- this.data.img_y;
                 this.setData({
-                    'img_top': yMove,
-                    'img_left': xMove,
+                    'img_top': yMove*0.8,
+                    'img_left': xMove*0.8,
                 });
-                this.data.img_x=e.touches[0].clientX;
-                this.data.img_y=e.touches[0].clientY;
             }
 
 
      },
 
+    touchendCallback:function (e) {
+        this.data.tc_end=1;
+    },
+
+
+    //--定义的保存图片方法，分享团---
+    saveImageToPhotosAlbum: function () {
+        var th=this;
+        var rpx =  this.data.cWidth / 750 * 1.35;  //基础单位，
+        //--先判断会员状态--
+        var user_info = getApp().globalData.userInfo;
+        if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+            wx.navigateTo({url: '/pages/togoin/togoin',})
+            return false;
+        }
+        if (this.data.share_hidden) {
+            this.setData({share_hidden: false,});
+        }
+        ;
+
+        wx.showLoading({title: '生成中...',})
+        var that = this, th = that;
+        //设置画板显示，才能开始绘图
+        that.setData({canvasHidden: false })
+
+        var app = getApp();
+        var scene = this.data.id + "";
+        var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
+        if (user_id > 0) {
+            scene += "_" + user_id;
+        }
+        ///二微码
+        var path3 = setting.url + "/api/wx/open/app/user/getWeAppEwm/" +
+            setting.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+
+        // 读取文件成功则OK--
+        wx.getImageInfo({
+            src: path3,
+            success: function (res) {
+                    var b=1.1;
+                    //获取到二维码的图片
+                    var vpath = res.path;
+                    var context = wx.createCanvasContext('share');
+                    // 先画背景
+                    context.fillStyle = '#ebf6f8';
+                    // 灰色实心矩形
+                    // 1. 语法： x坐标, y坐标, 宽度, 高度
+                    context.fillRect(0,0,750 * rpx,1338 * rpx);
+
+                    context.setFontSize(20* rpx)
+                    context.setFillStyle("#00d8e9")
+                    context.fillText("官方检测认证", 28*b* rpx, 80*b* rpx);
+
+                    //两个底部颜色
+                    context.fillStyle = '#a7ecf5';
+                    context.fillRect(28 *b* rpx,136 *b* rpx,262 *b* rpx,18 *b* rpx);
+                    context.fillRect(28 *b* rpx,194 *b* rpx,262 *b* rpx,18 *b* rpx);
+
+                    context.setFontSize(42*b*rpx)
+                    context.setFillStyle("#070609")
+                    context.fillText("我的肌底强韧", 30*b* rpx, 140*b* rpx);
+                    context.fillText("肌肤鲜活润泽", 30*b* rpx, 196*b* rpx);
+
+                    //先画一个圆形
+                    th.circle(context,110*b*rpx, 280*b*rpx,140*b*rpx,"#e7f3f8");
+                    th.circle(context,130*b*rpx, 300*b*rpx,120*b*rpx,"#c8f2fa");
+                    //绘制人脸
+                    context.drawImage(th.data.share_head, 132*b*rpx, 310*b*rpx, 230*b* rpx, 230 *b* rpx);
+
+                    //左右俩个框并填充文字
+                    th.darwRoundRect(38 *b* rpx,340*b*rpx,140*b*rpx,40*b*rpx,20*b*rpx,context);
+                    th.darwRoundRect(324 *b* rpx,340*b*rpx,140*b*rpx,40*b*rpx,20*b*rpx,context);
+                    context.setFontSize(20*b*rpx)
+                    context.setFillStyle("black")
+                    context.fillText("黑眼圈 重度", 50*b* rpx, 368*b* rpx);
+                    context.fillText("毛孔 较粗大", 336*b* rpx, 368*b* rpx);
+
+                    //左右俩个框并填充文字
+                    th.darwRoundRect(40 *b* rpx,412*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
+                    th.darwRoundRect(348 *b* rpx,412*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
+                    context.setFillStyle("black")
+                    context.fillText("黑头 重度", 52*b* rpx, 440*b* rpx);
+                    context.fillText("色斑 轻度", 354*b* rpx, 440*b* rpx);
+
+                    //左右俩个框并填充文字
+                    th.darwRoundRect(60 *b* rpx,484*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
+                    th.darwRoundRect(328 *b* rpx,484*b*rpx,116*b*rpx,40*b*rpx,20*b*rpx,context);
+                    context.setFillStyle("black")
+                    context.fillText("皱纹 重度", 74*b* rpx, 510*b* rpx);
+                    context.fillText("痤疮 轻度", 344*b* rpx, 510*b* rpx);
+
+                    //底部的绘制
+                    th.darwRoundRect(38 *b* rpx,650*b*rpx,430*b*rpx,160*b*rpx,10*b*rpx,context);
+                    //绘制二维码
+                    context.drawImage(vpath, 60*b*rpx, 672*b*rpx, 120 *b* rpx, 120 *b* rpx);
+                    context.setFillStyle("black")
+                    context.setFontSize(32*b*rpx)
+                    context.fillText("美肤管家AI测肤", 200*b* rpx, 726*b* rpx);
+                    context.setFontSize(22*b*rpx)
+                    context.fillText("科学了解皮肤的真实状态", 200*b* rpx, 766*b* rpx);
+
+                    //把画板内容绘制成图片，并回调 画板图片路径
+                    context.draw(false, function () {
+                        setTimeout(function () {
+                            wx.canvasToTempFilePath({
+                                x: 0,
+                                y: 0,
+                                width: 750,
+                                height: 1338,
+                                destWidth: 1.4 * 750 * 750 / th.data.screenWidth,
+                                destHeight: 1.4 * 750 * 750 / th.data.screenWidth,
+                                canvasId: 'share',
+                                success: function (res) {
+                                    that.setData({
+                                        shareImgPath: res.tempFilePath,
+                                        canvasHidden: true,
+                                        share_show:1
+                                    })
+
+                                    if (!res.tempFilePath) {
+                                        wx.showModal({
+                                            title: '提示',
+                                            content: '图片绘制中，请稍后重试',
+                                            showCancel: false
+                                        })
+                                        return false;
+                                    }
+
+                                    /*--
+                                    wx.previewImage({
+                                       //将图片预览出来
+                                       ur--*/
+
+                                    wx.hideLoading();
+                                }
+                            })
+                        }, 500)
+
+                    });
+
+            },
+            fail: function (res) {
+                console.log(res);
+                wx.hideLoading();
+            }
+        });
+    },
+
+
+    // 圆形图片
+    circle: function (ctx, x, y, r,color){
+        ctx.save()
+        ctx.beginPath();
+        var cx = x + r;
+        var cy = y + r;
+        ctx.arc(cx, cy, r, 0, 2 * Math.PI);
+        ctx.clip();
+        ctx.fillStyle = color;
+        ctx.fillRect(x,y,2 * r,2 * r);
+        ctx.restore()
+        ctx.closePath();
+    },
+
+    /**
+     * 绘制圆角矩形
+     * @param {*} x 起始点x坐标
+     * @param {*} y 起始点y坐标
+     * @param {*} w 矩形宽
+     * @param {*} h 矩形高
+     * @param {*} r 圆角半径
+     * @param {*} ctx 画板上下文
+     */
+    darwRoundRect(x, y, w, h, r, ctx) {
+        ctx.save()
+        ctx.beginPath()
+
+        // 左上弧线
+        ctx.arc(x + r, y + r, r, 1 * Math.PI, 1.5 * Math.PI)
+        // 左直线
+        ctx.moveTo(x, y + r)
+        ctx.lineTo(x, y + h - r)
+        // 左下弧线
+        ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, 1 * Math.PI)
+        // 下直线
+        ctx.lineTo(x + r, y + h)
+        ctx.lineTo(x + w - r, y + h)
+        // 右下弧线
+        ctx.arc(x + w - r, y + h - r, r, 0 * Math.PI, 0.5 * Math.PI)
+        // 右直线
+        ctx.lineTo(x + w, y + h - r)
+        ctx.lineTo(x + w, y + r)
+        // 右上弧线
+        ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI)
+        // 上直线
+        ctx.lineTo(x + w - r, y)
+        ctx.lineTo(x + r, y)
+
+        ctx.setFillStyle('white')
+        ctx.fill()
+    },
+    close_share:function () {
+        this.setData({share_show:0})
+    },
+
+
+    // 保存图片到手机
+    savePic() {
+        var self = this;
+        // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
+        this.getSetting().then((res) => {
+            // 判断用户是否授权了保存到相册的权限，如果没有发起授权
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+                this.authorize().then(() => {
+                    // 同意授权后保存下载文件
+                    this.saveImage(self.data.shareImgPath)
+                        .then(() => {
+                            self.setData({
+                                share_show: false
+                            });
+                        });
+                })
+            } else {
+                // 如果已经授权，保存下载文件
+                this.saveImage(self.data.shareImgPath)
+                    .then(() => {
+                        self.setData({
+                            share_show: false
+                        });
+                    });
+            }
+
+        })
+    },
+    // 获取用户已经授予了哪些权限
+    getSetting() {
+        return new Promise((resolve, reject) => {
+            wx.getSetting({
+                success: res => {
+                    resolve(res)
+                }
+            })
+        })
+    },
+    // 发起首次授权请求
+    authorize() {
+        // isFirst 用来记录是否为首次发起授权，
+        // 如果首次授权拒绝后，isFirst赋值为1
+        let isFirst = wx.getStorageSync('isFirst') || 0;
+        return new Promise((resolve, reject) => {
+            wx.authorize({
+                scope: 'scope.writePhotosAlbum',
+                // 同意授权
+                success: () => {
+                    resolve();
+                },
+                // 拒绝授权,这里是用户拒绝授权后的回调
+                fail: res => {
+                    if (isFirst === 0) {
+                        wx.setStorageSync('isFirst', 1);
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none',
+                            duration: 1000
+                        })
+                    } else {
+                        this.showModal();
+                    }
+                    console.log('拒绝授权');
+                    reject();
+                }
+            })
+        })
+    },
+    // 保存图片到系统相册
+    saveImage(saveUrl) {
+        var self = this;
+        return new Promise((resolve, reject) => {
+            wx.saveImageToPhotosAlbum({
+                filePath: saveUrl,
+                success: (res) => {
+                    wx.showToast({
+                        title: '保存成功',
+                        duration: 1000,
+                    });
+                    resolve();
+                },
+                fail: () => {
+                    wx.showToast({
+                        title: '保存失败',
+                        duration: 1000,
+                    });
+                }
+            })
+        })
+    },
+
+    //-----领取券-----
+    get_quan: function (e) {
+
+        var cid = e.currentTarget.dataset.cid;
+        var index = e.currentTarget.dataset.ind;
+        var q_word = e.currentTarget.dataset.word;
+        var item = this.data[q_word][index];
+
+        //--先判断会员状态--
+        var user_info = getApp().globalData.userInfo;
+        if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+            wx.navigateTo({
+                url: '/pages/togoin/togoin',
+            })
+            return false;
+        }
+
+
+        //如果券还在领取中，不能再点
+        if (item.linging == 1) {
+            getApp().my_warnning('领取中..', 0, this);
+            return false;
+        }
+
+        //如果领取的次数到了
+        if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) {
+            getApp().my_warnning('领取失败，您已领完该券', 0, this);
+            return false;
+        }
+
+        var lq_num = item.lqnum;
+
+        var pdata = {
+            'uid': getApp().globalData.user_id,
+            'cid': cid,
+            'store_id': setting.stoid,
+            'type': 5
+        };
+
+        //-- 导购ID --
+        if (getApp().globalData.guide_id) {
+            pdata.guide_id = getApp().globalData.guide_id;
+        }
+
+        var app = getApp(),th = this;
+        wx.showLoading();
+        app.request.post("/api/weshop/couponList/saveCouponList", {
+            data: pdata,
+            success: function (res) {
+                wx.hideLoading();
+                if (res.data.code == 0) {
+                    app.my_warnning("领取成功", 1, th);
+                    lq_num++;
+                    var text = q_word+"[" + index + "].lqnum";
+                    var text2 = q_word+"[" + index + "].linging";
+                    var obj = {};
+                    obj[text] = lq_num;
+                    obj[text2] = 0;
+                    th.setData(obj);
+                } else {
+                    app.confirmBox(res.data.msg);
+                    var text2 = q_word+"[" + index + "].linging";
+                    var obj = {};
+                    obj[text2] = 0;
+                    th.setData(obj);
+                }
+            }
+        })
+    },
+
+
 
 })
\ No newline at end of file
diff --git a/packageD/pages/AI-test-skin/success_result/success_result.json b/packageD/pages/AI-test-skin/success_result/success_result.json
index a5e71b9..f89c370 100644
--- a/packageD/pages/AI-test-skin/success_result/success_result.json
+++ b/packageD/pages/AI-test-skin/success_result/success_result.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
   },
+  "disableScroll": true,
   "navigationBarTitleText": "测肤报告"
 }
\ No newline at end of file
diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxml b/packageD/pages/AI-test-skin/success_result/success_result.wxml
index 1462986..3b611a0 100644
--- a/packageD/pages/AI-test-skin/success_result/success_result.wxml
+++ b/packageD/pages/AI-test-skin/success_result/success_result.wxml
@@ -28,7 +28,7 @@
                 <view class="mark">痤疮 {{acne_num}}</view>
             </view>
         </view>
-        <view class="score">
+        <view class="score" style="display: none">
             <view>
                 <view class="fs28">综合得分</view>
                 <view class="t-c mt10">
@@ -97,12 +97,12 @@
 
 
 <view class="mask" catchtap="close_mask" wx:if="{{showDialog}}"></view>
-<cover-view bindtap="click_share" class="share fs28">
+<cover-view bindtap="saveImageToPhotosAlbum" class="share fs28">
     <cover-view class="iconfont icon-zhuanfa1" style="padding: 0 10rpx;"></cover-view>
     <cover-view>分享</cover-view>
 </cover-view>
 
-
+<!-- 问题标注 -->
 <view class="dialog {{img_scale?'scale':'fangda'}}" wx:if="{{showDialog}}">
     <!-- 局部放大的 -->
     <block wx:if="{{img_scale}}">
@@ -193,47 +193,12 @@
             </view>
         </view>
     </block>
-    <block wx:elif="{{share_flag}}">
-        <view class="dialog_icon" catchtap="close_dialog" style="justify-content: flex-start;">
-            <text class="iconfont icon-guan mt20" style="z-index: 999;font-size: 20rpx;"></text>
-        </view>
-        <view class="share_dialog">
-            <view class="fs24" style="width: 50%;">
-                <view style="color: #6adaec;margin-bottom:20rpx;">官方检测认证</view>
-                <view class="renzheng">我的肌底强韧肌肤鲜活润泽</view>
-            </view>
-            <view class="analyse1">
-                <view class="analyse_left1">
-                    <view class="mark1">毛孔 {{pore_num}}</view>
-                    <view class="mark1" style="margin: 40rpx 0;">色斑 {{speckle_num}}</view>
-                    <view class="mark1">黑眼圈 {{s_filter.get_dark_type(dark_type)}}</view>
-                </view>
-                <view class="analyse_center1">
-                    <image style="width: 100%;height: 100%;" wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv.png"></image>
-                    <image style="width: 100%;height: 100%;" wx:else src="{{iurl}}/miniapp/images/skinimg/nan.png"></image>
-                </view>
-                <view class="analyse_right1">
-                    <view class="mark1">黑头 {{blackhead_num}}</view>
-                    <view class="mark1" style="margin: 40rpx 0;">皱纹 {{wrinkle_num}}</view>
-                    <view class="mark1">痤疮 {{acne_num}}</view>
-                </view>
-            </view>
-
-            <view class="share_dialog_bottom">
-                <image style="width: 80rpx;height: 80rpx;margin:0 20rpx 0 10rpx" src="{{iurl}}/miniapp/images/skinimg/heiyanquan.png"></image>
-                <view style="font-size: 24rpx;">
-                    <view>美肤管家AI测肤</view>
-                    <view>科学了解皮肤的真实状态</view>
-                </view>
-            </view>
-        </view>
-    </block>
     <!-- 全图的，能够自由拖拽和放大 -->
 
     <!-- 缩小 -->
     <block wx:else>
-        <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback'
-              style="position: relative;transform: scale(img_scale);top: {{img_top}}px; left: {{img_left}}px;">
+        <view bindtouchstart='touchstartCallback' bindtouchmove='touchmoveCallback' bindtouchEnd='touchendCallback'
+              style="position: relative;transform: scale({{ig_scale}});top: {{img_top}}px; left: {{img_left}}px;">
             <image style="width: 100%;" src="{{iurl}}{{face_img}}" mode="widthFix" ></image>
 
             <block wx:if="{{yanjing}}">
@@ -291,4 +256,20 @@
             <text catchtap="click_fangda" class="iconfont icon-suoxiao mgb20"></text>
         </view>
     </block>
-</view>
\ No newline at end of file
+</view>
+
+
+<!-- 二维码显示页面 -->
+<canvas canvas-id='share' style='width:750rpx;height:1338rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas>
+
+<!-- 展示分享图 -->
+<view id="share_show" wx:if="{{share_show}}">
+   <view class="cover-layer" bindtap="close_share" style="z-index: 77777"></view>
+   <view class="share_content">
+         <view class="sh_close" bindtap="close_share"><text class="iconfont icon-close"></text></view>
+         <image src="{{shareImgPath}}" style="width: 100%"  mode="widthFix"></image>
+         <view class="share_save_btn" bindtap="savePic">保存到相册</view>
+   </view>
+</view>
+
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxss b/packageD/pages/AI-test-skin/success_result/success_result.wxss
index c204f36..29af08a 100644
--- a/packageD/pages/AI-test-skin/success_result/success_result.wxss
+++ b/packageD/pages/AI-test-skin/success_result/success_result.wxss
@@ -529,7 +529,7 @@ page {
     left: 205rpx;
     width: 30rpx;
     height: 30rpx;
-    background: #fff;
+    background: #e6f4fa;
     overflow: hidden;
 }
 
@@ -568,7 +568,7 @@ page {
 }
 
 .background {
-    background: #f40028;
+    background: #45d4eb;
 }
 
 .xc-get {
@@ -589,7 +589,7 @@ page {
     left: 205rpx;
     width: 30rpx;
     height: 30rpx;
-    background: #fff;
+    background: #e6f4fa;
 }
 
 .abs {
@@ -613,7 +613,8 @@ page {
 
 .share_dialog {
     background: #e8f5fd;
-    height: 100%;
+    width: 600rpx;
+    height: 700rpx;
     padding: 40rpx;
     display: flex;
     flex-direction: column;
@@ -632,4 +633,19 @@ page {
     display: flex;
     padding: 30rpx;
     border-radius: 20rpx;
+}
+
+.share_content{position: fixed;z-index: 999999;top: 50%; left: 50%; width: 70%;transform: translate(-50%, -50%);}
+.share_save_btn{width: 100%; height: 80rpx;line-height: 80rpx; text-align: center;color: #fff;background-color:#c3172d }
+.sh_close{ position: absolute; right: 20rpx;top: 20rpx;width: 70rpx; height: 70rpx;
+    display: flex;justify-content: center;align-items: center;font-size: 26rpx;
+    border-radius: 50%; background-color: grey;color: #fff}
+
+@font-face {
+    font-family: "iconfont"; /* Project id  */
+    src: url('iconfont.ttf?t=1645607343376') format('truetype');
+}
+
+.icon-close:before {
+    content: "\e668";
 }
\ No newline at end of file
diff --git a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js
index fd042fa..83c68b2 100644
--- a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js
+++ b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.js
@@ -1,15 +1,9 @@
-/*
- * @Author: abson
- * @Date: 2022-02-21 11:03:07
- * @LastEditTime: 2022-02-21 17:50:01
- * @LastEditors: Please set LastEditors
- * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\wrinkle\wrinkle.js
- */
 module.exports = {
 
 	//把组合购的商品价格计算出来,同时每个会员都有购买组合商品的上限！ladder_b_num是已经购买了多少件
-	get_goods: function(th,stoid) {
-        var r_code='02';
+	get_goods: function(th,stoid,sort) {
+        th.setData({wrinkle_sort:sort});
+	    var r_code='02';
         //获取痘痘的类型
         var list=th.data.face_data.wrinkle.wrinkle_types;
         //把所有的斑的类型拿出来
@@ -42,7 +36,12 @@ module.exports = {
          var  url="/api/weshop/prom/coupon/pageCouponList?orderField=RAND()&recommend_code="+r_code+"&store_id="+stoid+"&recommend_word="+re_word+"&pageSize=2";
          getApp().request.promiseGet(url, {}).then(res=>{
            if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-               th.setData({wrinkle_quan_list:res.data.data.pageData});
+               var arr=res.data.data.pageData;
+               arr.map(function (e) {
+                   e.q_word='wrinkle_quan_list';
+                   return e;
+               })
+               th.setData({wrinkle_quan_list:arr});
            }
          })
 	},
diff --git a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
index 3fe0ff1..7c64351 100644
--- a/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
+++ b/packageD/pages/AI-test-skin/success_result/wrinkle/wrinkle.wxml
@@ -2,7 +2,7 @@
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#03</view>
+                <view style="color: #45d4eb;">#0{{wrinkle_sort}}</view>
                 <view class="flex-space-between">
                     <text style="font-size: 42rpx;" class="bold">皱纹</text>
                     <view class="fs26" catchtap="show_dailog" data-type="3" style="display: flex;align-items: center;">
@@ -17,7 +17,7 @@
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
-                    <view class="bold">较粗大</view>
+                    <view class="bold">皱纹数{{wrinkle_num}}条</view>
                 </view>
             </view>
             <view class="analyse" style="height:400rpx;">
@@ -50,7 +50,7 @@
                 </view>
             </view>
             <view class="fs28 mt_b10">
-                <text>明显可见毛孔或内含小于毛孔大小角栓</text>
+                <text>隐约可见皱纹</text>
             </view>
         </view>
         <view class="analyse_classify_body">
@@ -116,7 +116,7 @@
         <!-- 优惠券 -->
         <view wx:if="{{wrinkle_quan_list}}">
             <view style="margin:5% 0">适合皱纹商品的优惠券</view>
-            <view class="xc-coupon-frame rel">
+            <view class="xc-coupon-frame">
                 <block wx:for="{{wrinkle_quan_list}}">
                     <include src="../coupon.wxml" />
                 </block>
--
libgit2 0.21.4