Merge branch 'test' into 'qa'

Test See merge request !967

Merge branch 'test' into 'qa'
Test See merge request !967
后端研发-苏明海
2 parents 739be5f8 a1b3d341
Showing 61 changed files with 1514 additions and 707 deletions
app.json
components/diy_goodsGroup/diy_goodsGroup.js
packageB/pages/AI-test-skin/history_record/history_record.wxml
packageB/pages/AI-test-skin/success_result/success_result.js
packageB/components/ec-canvas/ec-canvas.js → packageD/components/ec-canvas/ec-canvas.js
packageB/components/ec-canvas/ec-canvas.json → packageD/components/ec-canvas/ec-canvas.json
packageB/components/ec-canvas/ec-canvas.wxml → packageD/components/ec-canvas/ec-canvas.wxml
packageB/components/ec-canvas/ec-canvas.wxss → packageD/components/ec-canvas/ec-canvas.wxss
packageB/components/ec-canvas/echarts.js → packageD/components/ec-canvas/echarts.js
packageB/components/ec-canvas/wx-canvas.js → packageD/components/ec-canvas/wx-canvas.js
packageB/pages/AI-test-skin/analyse/analyse.js → packageD/pages/AI-test-skin/analyse/analyse.js
packageB/pages/AI-test-skin/analyse/analyse.json → packageD/pages/AI-test-skin/analyse/analyse.json
packageB/pages/AI-test-skin/analyse/analyse.wxml → packageD/pages/AI-test-skin/analyse/analyse.wxml
packageB/pages/AI-test-skin/analyse/analyse.wxss → packageD/pages/AI-test-skin/analyse/analyse.wxss
packageB/pages/AI-test-skin/fail_result/fail_result.js → packageD/pages/AI-test-skin/fail_result/fail_result.js
packageB/pages/AI-test-skin/fail_result/fail_result.json → packageD/pages/AI-test-skin/fail_result/fail_result.json
packageB/pages/AI-test-skin/fail_result/fail_result.wxml → packageD/pages/AI-test-skin/fail_result/fail_result.wxml
packageB/pages/AI-test-skin/fail_result/fail_result.wxss → packageD/pages/AI-test-skin/fail_result/fail_result.wxss
packageB/pages/AI-test-skin/fail_result/iconfont.ttf → packageD/pages/AI-test-skin/fail_result/iconfont.ttf
packageB/pages/AI-test-skin/fail_result/iconfont.woff → packageD/pages/AI-test-skin/fail_result/iconfont.woff
@@ -154,14 +154,8 @@
                 "pages/user/choice_guide/choice_guide",
                 "pages/video/index",
                 "pages/boxes-list/boxes-list",
-                "pages/boxes-details/boxes-details",
-                "pages/AI-test-skin/index/aiskin",
-                "pages/AI-test-skin/shoot_notice/shoot_notice",
-                "pages/AI-test-skin/history_record/history_record",
-                "pages/AI-test-skin/select_photo/select_photo",
-                "pages/AI-test-skin/fail_result/fail_result",
-                "pages/AI-test-skin/success_result/success_result",
-                "pages/AI-test-skin/analyse/analyse"
+                "pages/boxes-details/boxes-details"
+
             ]
         },
         {
@@ -187,6 +181,19 @@
                 "pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo",
                 "pages/luckyGo/luckyGo_activityList/luckyGo_activityList"
             ]
+        },
+        {
+            "root": "packageD/",
+            "name": "pack4",
+            "pages": [
+                "pages/AI-test-skin/index/aiskin",
+                "pages/AI-test-skin/shoot_notice/shoot_notice",
+                "pages/AI-test-skin/history_record/history_record",
+                "pages/AI-test-skin/select_photo/select_photo",
+                "pages/AI-test-skin/fail_result/fail_result",
+                "pages/AI-test-skin/success_result/success_result",
+                "pages/AI-test-skin/analyse/analyse"
+            ]
         }
     ],
     "permission": {
@@ -449,7 +449,7 @@ Component({
 			var now = ut.gettimestamp();
 			var th = this;
 			if (!goods || goods.length == 0) return false;
-			var user_id = getApp().globalData.userInfo.user_id;
+			var user_id = getApp().globalData.user_id;
 			if (!user_id) user_id = 0;
 			for (var i in goods) {
 				var val = goods[i];
-<view class="content">
-    <view style="margin-bottom: 5%;">历史分析</view>
-    <view class="echarts" style="border-radius: 30rpx;">
-        <view class="tubiao">
-            <ec-canvas id="mychart" canvas-id="mychart-bar" ec="{{ec}}"></ec-canvas>
-        </view>
-        <text class="fs24" style="position:absolute;bottom:25px;color: #333;">
-            注：请确保多次拍摄姿态和环境光线一致。拍摄姿态的偏移、环境光线变化或者皮肤状态变化都可能导致分数较大波动。
-        </text>
-    </view>
-    <view class="mgv5">历史报告</view>
-   
-    <view class="history_list">
-        <view class="history_list_month">
-            <view style="color:#333;font-size:26rpx;margin-top: 30rpx">2022年02月</view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-        </view>
-        <view class="history_list_month">
-            <view style="color:#333;font-size:26rpx;margin-top: 30rpx">2022年02月</view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-        </view>
-        <view class="history_list_month">
-            <view style="color:#333;font-size:26rpx;margin-top: 30rpx">2022年02月</view>
-            <view class="souce">
-                <view style="font-weight: 600;">2022/02/19 15:35</view>
-                <view style="color:#fbb11f;">73分</view>
-            </view>
-        </view>
-    </view>
-</view>
 \ No newline at end of file
-/*
- * @Author: abson
- * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-21 16:07:09
- * @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
- */
-// packageB/pages/AI-test-skin/success_result/success_result.js
-const app = getApp();
-const request = app.request;
-const os = app.globalData;
-const setting = os.setting;
-const ut = require('../../../../utils/util');
-//毛孔
-const acne = require('acne/acne');
-const blackhead = require('blackhead/blackhead');
-const dark = require('dark/dark');
-const pore = require('pore/pore');
-const speckle = require('speckle/speckle');
-const wrinkle = require('wrinkle/wrinkle');
-Page({
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        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: '敏感度' }],
-        currentIndex: 0,
-        tab_id: 'zong_he',
-        iurl: setting.imghost,
-        showDialog: false,
-        yanjing: true,  //显示皮肤问题
-        img_scale: true, //问题标注放大图片
-        img_scale_icon:true,
-        show_problem:1, //问题标注显示问题
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-       var th=this;
-       //初始化一下，获取商品的价格
-       this.init();
-       //var face_result=getApp().globalData.face_result;
-       //var face_data=face_result.face_list[0];
-       this.data.id=options.id;
-
-        //计算图片要显示的大小
-        th.data.cWidth = wx.getSystemInfoSync().windowWidth;
-        th.data.cHeight = wx.getSystemInfoSync().windowHeight;
-        th.data.face_height=th.data.cHeight*0.8*0.8;
-
-        this.get_data(function (json,img) {
-           //-- 数据先存着 --
-           var face_data=th.data.face_data=json.face_list[0];
-           //痤疮数
-           var acne_num=face_data.acnespotmole.acne_num;
-           //色斑数
-           var speckle_num=face_data.acnespotmole.speckle_num;
-           //皱纹数
-           var wrinkle_num=face_data.wrinkle.wrinkle_num;
-           //黑头数
-           var blackhead_num=face_data.blackheadpore.blackhead_num;
-           //毛孔数
-           var pore_num=face_data.blackheadpore.pore_num;
-           //黑眼圈的严重程度
-           var dark_type=face_data.eyesattr.dark_circle_left_type.length>0?face_data.eyesattr.dark_circle_left_type[0]:-1;
-           var dark_type1=face_data.eyesattr.dark_circle_right_type.length>0?face_data.eyesattr.dark_circle_right_type[0]:-1;
-           if(dark_type1>dark_type){
-               dark_type=dark_type1;
-           }
-           var skin_sensitive_check= parseInt(face_data.skinquality.skin_sensitive_check[0]);
-           var skin_dryoil_check=face_data.skinquality.skin_dryoil_check;
-
-           var location=face_data.location;
-           th.data.bili=th.data.face_height/(location.height+location.height/2.3);
-
-           th.setData({
-               acne_num:acne_num,
-               speckle_num:speckle_num,
-               wrinkle_num:wrinkle_num,
-               blackhead_num:blackhead_num,
-               pore_num:pore_num,
-               dark_type:dark_type,
-               skin_sensitive_check:skin_sensitive_check,
-               skin_dryoil_check:skin_dryoil_check,
-               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
-           })
-           //-- 调用毛孔的推荐函数 --
-           if(pore_num>0)
-               pore.get_goods(th,setting.stoid);
-           //-- 调用黑头的推荐函数 --
-           if(blackhead_num>0)
-               blackhead.get_goods(th,setting.stoid);
-           //-- 调用色斑的推荐函数 --
-           if(speckle_num>0)
-               speckle.get_goods(th,setting.stoid);
-           //-- 调用皱纹的推荐函数 --
-           if(wrinkle_num>0)
-               wrinkle.get_goods(th,setting.stoid);
-           //-- 黑眼圈 --
-           if(dark_type>-1)
-               dark.get_goods(th,setting.stoid);
-           //-- 黑眼圈 --
-           if(acne_num>-0)
-               acne.get_goods(th,setting.stoid);
-       })
-    },
-
-    //-- 初始等级卡 --
-    init: function () {
-        var th = this;
-        if (!getApp().globalData.user_id) return false;
-        getApp().request.get("/api/weshop/users/get/" + setting.stoid + "/" + getApp().globalData.user_id, {
-            isShowLoading: false,
-            success: function (e) {
-                if (e.data.code == 0 && e.data && e.data.data) {
-                    getApp().globalData.userInfo = e.data.data;
-                    getApp().getConfig2(function (e) {
-                        var swithc_list = e.switch_list;
-                        var sw_arr = JSON.parse(swithc_list);
-                        //---如果后台有开等级卡的开关---
-                        if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-                            th.setData({
-                                rank_switch: true
-                            });
-                            //---回调卡的列表---
-                            th.getPlusCardType(function (ob) {
-                                th.setData({
-                                    card_list: ob.card_list
-                                });
-                                var ti = setInterval(function () {
-                                    var user = getApp().globalData.userInfo;
-                                    if (!user) return false;
-                                    clearInterval(ti);
-                                    if (user.card_field && user['card_expiredate']) {
-                                        var str = user['card_expiredate'].replace(/-/g, '/');
-                                        var end = new Date(str);
-                                        end = Date.parse(end) / 1000;
-                                        var now = ut.gettimestamp();
-                                        //--- 判断是等级会员，且在有效期范围内 ---
-                                        if (user.card_field && now < end) {
-                                            var card_name = ob.name_map.get(user.card_field);
-                                            if (card_name.length > 4) card_name = card_name.substring(0, 8);
-                                            th.setData({
-                                                card_field: user.card_field,
-                                                card_name: card_name,
-                                                card_list: ob.card_list
-                                            });
-                                        }
-                                    }
-                                }, 500)
-                            })
-                        }
-                    })
-
-                }
-            }
-        })
-    },
-    //-- 获取json数据 --
-    get_data:function (func) {
-       var url="/api/weshop/face/storeSkinface/get/"+setting.stoid+"/"+this.data.id;
-       getApp().request.promiseGet(url, {}).then(res=>{
-         if(res.data.code==0){
-             var json=JSON.parse(res.data.data.resultjson);
-             func(json,res.data.data.img)
-         }else{
-             getApp().showWarning("获取数据失败");
-         }
-       })
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {},
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {},
-
-    clickTab(e) {
-        let { index, tab_id } = e.currentTarget.dataset;
-        this.setData({
-            currentIndex: index,
-            tab_id,
-        })
-    },
-    click_yanjing() {
-        this.setData({
-            yanjing: !this.data.yanjing,
-        })
-    },
-    click_fangda() {
-        this.setData({
-            img_scale: !this.data.img_scale,
-            img_scale_icon:!this.data.yanjing,
-        })
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-    show_dailog(e) {
-        var type=parseInt(e.currentTarget.dataset.type);
-        this.setData({
-            showDialog: true,show_type:type
-        })
-        switch (type){
-         	case 1: //毛孔
-                var pore_list=this.data.face_data.blackheadpore.circles[0].pore;
-                this.setData({pore_list:pore_list});
-         		break;
-            case 2://色斑
-                var speckle_list=this.data.face_data.acnespotmole.speckle_list;
-                this.setData({speckle_list:speckle_list});
-                break;
-         	case 3://皱纹
-                var wrinkle_list=this.data.face_data.wrinkle.wrinkle_data;
-                this.setData({wrinkle_list:wrinkle_list});
-         		break;
-            case 4://黑头
-                var blackhead_list=this.data.face_data.blackheadpore.circles[0].blackhead;
-                this.setData({blackhead_list:blackhead_list});
-                break;
-            case 5://黑眼圈
-                var arr=this.data.face_data.eyesattr.dark_circle_left[0];
-                var arr2=this.data.face_data.eyesattr.dark_circle_right[0];
-                var  arr3=[...arr,...arr2];
-                this.setData({dark_list:arr3});
-                break;
-            case 6://痤疮
-                var acne_list=this.data.face_data.acnespotmole.acne_list;
-                this.setData({acne_list:acne_list});
-                break;
-         	default:
-         	 	break
-        }
-    },
-
-    close_dialog() {
-        this.setData({
-            showDialog: false,
-        })
-    },
-
-    close_mask() {
-        this.setData({
-            showDialog: false,
-            img_scale: true,
-        })
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-
-    //商品页面跳转
-    go_url:function (e) {
-        var url=e.currentTarget.dataset.url;
-        getApp().goto(url);
-    },
-
-    //--- 获取卡类列表 ---
-    getPlusCardType: function (func) {
-        var storid = setting.stoid;
-        var th = this;
-        getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
-
-            if (res.data.code != 0 || !res.data.data) {
-                var ob = {
-                    "card_list": [],
-                    "name_map": ""
-                };
-                func(ob);
-                return false;
-            }
-
-            var plusCard = res.data.data;
-            var arr = [1219, 2089, 3031];
-            var new_arr = new Array();
-            var card_name_map = new Map();
-
-            var user = getApp().globalData.userInfo;
-            if (plusCard) {
-                for (var i = 0; i < plusCard.length; i++) {
-                    if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
-                        continue;
-                    }
-                    var name = "card" + plusCard[i].CorrPrice.toLowerCase();
-                    card_name_map.set(name, plusCard[i].CardName);
-                    new_arr.push(plusCard[i]);
-
-                }
-            }
-            var ob = {
-                "card_list": new_arr,
-                "name_map": card_name_map
-            };
-            func(ob);
-        })
-    },
-
-    //图片加载的时候，计算图片的像素大小
-    face_img_load: function (e) {
-        var th=this;
-        var imgwidth = e.detail.width;
-        var imgheight = e.detail.height;
-
-        var w= th.data.cWidth*0.8;
-
-        this.setData({
-            iwidth:imgwidth*th.data.bili,
-            iheight:imgheight*th.data.bili,
-            bili1:w/imgwidth  //图片放大时候的比例
-        })
-    },
-})
 \ No newline at end of file
@@ -10,15 +10,15 @@ let initChart = null;
 const option = {
     backgroundColor: 'white',
     tooltip: {},
-    grid:{
+    grid: {
         // left:'20%',
-        top:'30%',
+        top: '30%',
         // right:'10%'
     },
     legend: {
         icon: 'circle',
-		itemWidth: 5,
-		itemHeight: 5,
+        itemWidth: 5,
+        itemHeight: 5,
         selected: {
             '综合': true,
             '毛孔': false,
@@ -29,7 +29,7 @@ const option = {
             '敏感度': false,
             '黑眼圈': false,
         },
-        padding:[20,50],
+        padding: [20, 50],
         data: [
             {
                 name: '综合',
@@ -183,7 +183,57 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        let url = `/api/weshop/face/storeSkinface/page`;
+        app.request.promiseGet(url, {
+            isShowLoading: true,
+            data: {
+                store_id: setting.stoid,
+                user_id: os.user_id,
+            }
+        }).then(res => {
+            console.log('111111111', res);
+            if (ut.ajax_ok(res)) {
+                let data = res.data.data.pageData;
+                let arr = [];
+                for (let i = 0; i < data.length; i++) {
+                    let history = data[i];
+                    let id = history.id;
+                    let now = new Date(history['addtime'] * 1000);
+                    let year = now.getFullYear(); //年
+                    let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
+                    let day = (now.getDate()).toString().padStart(2, 0); //日
+                    let hour = (now.getHours()).toString().padStart(2, 0); //时
+                    let minute = (now.getMinutes()).toString().padStart(2, 0); //分
+                    let history_time = `${year}年${month}月`;
+                    let time = `${year}/${month}/${day} ${hour}:${minute}`;
+                    let time_obj = {
+                        history_time,
+                        time_arr: new Array(),
+                    };
+                    if (arr.length > 0) {
+                        let index = arr.findIndex(item => {
+                            return item['history_time'] === history_time;
+                        })
+                        if (index > -1) {
+                            let obj = {
+                                time,
+                                id,
+                            };
+                            arr[index]['time_arr'].push(obj);
+                        } else {
+                            arr.push(time_obj);
+                        }
+                    } else {
+                        arr.push(time_obj);
+                    }
+                }
+                this.setData({
+                    history: arr,
+                })
+                initChart.setOption(option);
+            }
+        })
     },
     /**
@@ -192,17 +242,18 @@ Page({
     onReady: function () {
     },
-    initChartOption() {
-        initChart.setOption(option);
-    },
+
     /**
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
         setTimeout(() => {
-            initChart.setOption(option);
+
         }, 1000);
     },
+    go_result(e) {
+
+    },
     /**
      * 生命周期函数--监听页面隐藏
+<view class="content">
+    <view style="margin-bottom: 5%;">历史分析</view>
+    <view class="echarts" style="border-radius: 30rpx;">
+        <view class="tubiao">
+            <ec-canvas id="mychart" canvas-id="mychart-bar" ec="{{ec}}"></ec-canvas>
+        </view>
+        <text class="fs24" style="position:absolute;bottom:25px;color: #333;">
+            注：请确保多次拍摄姿态和环境光线一致。拍摄姿态的偏移、环境光线变化或者皮肤状态变化都可能导致分数较大波动。
+        </text>
+    </view>
+    <view class="mgv5">历史报告</view>
+   
+    <view class="history_list">
+        <view class="history_list_month" wx:for="{{history}}">
+            <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.time}}</view>
+            <view class="souce" wx:for="{{item.time_arr}}" wx:for-item="subitem" wx:for-index="subindex" wx:key="subindex"> 
+                <view style="font-weight: 600;">{{subitem}}</view>
+                <view style="color: #9b9b9b;" bindtap="go_result">去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
+            </view>
+        </view>
+    </view>
+</view>
 \ No newline at end of file
 /*
- * @Author: your name
+ * @Author: abson
  * @Date: 2022-02-11 14:13:05
- * @LastEditTime: 2022-02-16 14:18:30
+ * @LastEditTime: 2022-02-22 15:17:48
  * @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\index\aiskin.js
@@ -3,7 +3,7 @@
         <cover-view style="padding: 0 6rpx 0 25rpx;" bindtap="goto" data-url="/packageB/pages/AI-test-skin/history_record/history_record">历史档案</cover-view>
         <text class="iconfont icon-arrow_right"></text>
     </view>
-    <image src="{{iurl}}/miniapp/images/skinimg/3.jpeg"></image>
+    <image src="{{iurl}}/miniapp/images/skinimg/shouye.jpeg"></image>
     <view class="start_btn" bindtap="goto" data-url="/packageB/pages/AI-test-skin/shoot_notice/shoot_notice">
         <text>开始测肤</text>
     </view>
@@ -7,25 +7,25 @@
     <view>
         <view class="ready">
             <view class="image">
-                <image src="{{iurl}}/miniapp/images/skinimg/4.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei1.jpeg"></image>
                 <text class="shuxian"></text>
-                <image src="{{iurl}}/miniapp/images/skinimg/7.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei2.jpeg"></image>
             </view>
             <text class="fs28">1、请对准镜头，闭眼拍照</text>
         </view>
         <view class="ready">
             <view class="image">
-                <image src="{{iurl}}/miniapp/images/skinimg/5.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei3.jpeg"></image>
                 <text class="shuxian"></text>
-                <image src="{{iurl}}/miniapp/images/skinimg/7.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei2.jpeg"></image>
             </view>
             <text class="fs28">2、请摘下眼镜，撩起刘海</text>
         </view>
         <view class="ready">
             <view class="image">
-                <image src="{{iurl}}/miniapp/images/skinimg/8.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei4.jpeg"></image>
                 <text class="shuxian"></text>
-                <image src="{{iurl}}/miniapp/images/skinimg/10.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei5.jpeg"></image>
             </view>
             <text class="fs28">3、保持脸部垂直，切勿距离过远过近</text>
         </view>
@@ -37,13 +37,13 @@
     <view>
         <view class="ready">
             <view class="image_1">
-                <image src="{{iurl}}/miniapp/images/skinimg/6.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei6.jpeg"></image>
             </view>
             <text class="fs28">1、脸部置于画面中央，请勿距离过远或过近</text>
         </view>
         <view class="ready1">
             <view class="image_1">
-                <image src="{{iurl}}/miniapp/images/skinimg/9.jpeg"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/zhunbei7.jpeg"></image>
             </view>
             <text class="fs28">2、脸部保持平视摄像头</text>
         </view>
@@ -16,7 +16,7 @@ page {
 .content .work {
     text-align: center;
-    padding: 60rpx 0 30rpx 0;
+    padding: 50rpx 0 30rpx 0;
     font-size: 36rpx;
 }
-/*
- * @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});
            }
          })
+
+
 	},
 }
-<view class="mb_b5" id="cuo_chuang">
+<view class="mb_b5 cuo_chuang" id="cuo_chuang">
     <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;">
@@ -14,16 +14,16 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </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/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/cuochuang_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view>痤疮个数</view>
@@ -32,28 +32,28 @@
             </view>
             <view class="leixing mt_b10">
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao25.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/nongzhong.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>囊肿</view>
                         <view>健康</view>
                     </view>
                 </view>
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao28.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/qiuzheng.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>丘疹</view>
                         <view>健康</view>
                     </view>
                 </view>
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao27.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/fengci.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>粉刺</view>
                         <view>健康</view>
                     </view>
                 </view>
                 <view class="_img">
-                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/mao29.jpeg"></image>
+                    <image style="height:100rpx;width:100rpx;border-radius: 50%;opacity:0.6" src="{{iurl}}/miniapp/images/skinimg/douying.jpeg"></image>
                     <view class="fs28 c_666">
                         <view>痘印</view>
                         <view>健康</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>
-/*
- * @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});
            }
          })
-<view class="mb_b5" id="hei_tou">
+<view class="mb_b5 hei_tou" id="hei_tou">
     <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;">
@@ -13,16 +13,16 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </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="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/heitou_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">粗大区域</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>
 <!-- -单张的券- -->
+<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
-/*
- * @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});
            }
          })
 	},
-<view class="mb_b5" id="hei_yan_quan">
+<view class="mb_b5 hei_yan_quan" id="hei_yan_quan">
     <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;">
@@ -13,7 +13,7 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/heiyanquan.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx" style="margin-top:5%">
                     <view class="fs28">程度情况</view>
@@ -23,7 +23,7 @@
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/heiyanquan_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">黑眼圈类型</view>
@@ -32,26 +32,47 @@
             </view>
             <view>
-                <view class="heiyanquan">
-                    <image src="{{iurl}}/miniapp/images/skinimg/man1.jpeg" style="width: 100%;height: 100%;"></image>
-                </view>
-                <view class="leixing">
-                    <view class="_img">
-                        <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/man2.jpeg"></image>
-                        <view class="fs28">色素性-中度</view>
+                <block wx:if="{{sex === 'male'}}">
+                    <view class="heiyanquan">
+                        <image src="{{iurl}}/miniapp/images/skinimg/nan3.jpeg" style="width: 100%;height: 100%;"></image>
                     </view>
-                    <view class="_img">
-                        <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/man8.jpeg"></image>
-                        <view class="fs28">血管性-轻度</view>
+                    <view class="leixing">
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nan4.jpeg"></image>
+                            <view class="fs28">色素性-中度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nan5.jpeg"></image>
+                            <view class="fs28">血管性-轻度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nan6.jpeg"></image>
+                            <view class="fs28" style="color: #666;">阴影型-无</view>
+                        </view>
                     </view>
-                    <view class="_img">
-                        <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/man11.jpeg"></image>
-                        <view class="fs28" style="color: #666;">阴影型-无</view>
+                </block>
+                <block wx:else>
+                    <view class="heiyanquan">
+                        <image src="{{iurl}}/miniapp/images/skinimg/nv3.jpeg" style="width: 100%;height: 100%;"></image>
                     </view>
-                </view>
+                    <view class="leixing">
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv4.jpeg"></image>
+                            <view class="fs28">色素性-中度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv5.jpeg"></image>
+                            <view class="fs28">血管性-轻度</view>
+                        </view>
+                        <view class="_img">
+                            <image style="height:150rpx;width:150rpx;border-radius: 50%;" src="{{iurl}}/miniapp/images/skinimg/nv6.jpeg"></image>
+                            <view class="fs28" style="color: #666;">阴影型-无</view>
+                        </view>
+                    </view>
+                </block>
             </view>
             <view class="fs28 mt_b10">
-                <text>明显可见毛孔或内含小于毛孔大小角栓</text>
+                <text>隐约可见黑眼圈</text>
             </view>
         </view>
         <view class="analyse_classify_body">
@@ -110,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>
 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});
           }
         })
 	},
-<view class="mb_b5" id="mao_kong">
+<view class="mb_b5 mao_kong" id="mao_kong">
     <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,12 +17,12 @@
                 </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="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/maokong_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">粗大区域</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>
-/*
- * @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});
             }
         })
     },
-<view class="mb_b5" id="mao_kong">
+<view class="mb_b5 min_gan_du" id="min_gan_du">
     <view class="analyse_classify bg_white">
         <view class="analyse_classify_header">
             <view>
-                <view style="color: #45d4eb;">#01</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;">
@@ -13,23 +13,23 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">程度情况</view>
                     <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="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/mingandu_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">敏感度得分</view>
                     <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>
-/*
- * @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});
            }
          })
-<view class="mb_b5" id="se_ban">
+<view class="mb_b5 se_ban" id="se_ban">
     <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;">
@@ -13,16 +13,16 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_heitou_maokong_.png"></image>
                 </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="/packageB/images/Snipaste_2022-02-17_15-28-13.jpg"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/seban_icon.jpg"></image>
                 </view>
                 <view style="line-height:60rpx;margin-left:20rpx">
                     <view class="fs28">色斑个数</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>
+/*
+ * @Author: abson
+ * @Date: 2022-02-16 15:36:47
+ * @LastEditTime: 2022-02-24 14:16:37
+ * @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
+ */
+// packageB/pages/AI-test-skin/success_result/success_result.js
+const app = getApp();
+const request = app.request;
+const os = app.globalData;
+const setting = os.setting;
+const ut = require('../../../../utils/util');
+//毛孔
+const acne = require('acne/acne');
+const blackhead = require('blackhead/blackhead');
+const dark = require('dark/dark');
+const pore = require('pore/pore');
+const speckle = require('speckle/speckle');
+const wrinkle = require('wrinkle/wrinkle');
+Page({
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        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: 'min_gan_du', name: '敏感度' }],
+        zhouwen_arr: [{ id: 1, name: '全部皱纹' }, { id: 2, name: '泪沟' }, { id: 3, name: '法令纹' }, { id: 4, name: '口角纹' }, { id: 5, name: '眼部皱纹' }, { id: 6, name: '鱼尾纹' }, { id: 7, name: '抬头皱纹' }, { id: 8, name: '眉间纹' }],
+        cuochuang_arr: [{ id: 1, name: '全部痤疮' }, { id: 2, name: '痘印' }, { id: 3, name: '囊肿' }, { id: 4, name: '丘疹' }, { id: 5, name: '粉刺' }],
+        heitanquan_arr: [{ id: 1, name: '综合情况' }, { id: 2, name: '左眼' }, { id: 3, name: '右眼' }],
+        currentIndex: 0,
+        scroll_index: 0,
+        sex:'female',  //female女 male男
+        tab_id: 'zong_he',
+        iurl: setting.imghost,
+        showDialog: false,
+        yanjing: true,  //显示皮肤问题
+        img_scale: true, //问题标注放大图片
+        heightRecord: [],
+        img_scale_icon: true,
+        show_problem: 1, //问题标注显示问题
+        img_scale: 1, //缩放问题
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+        var th = this;
+        //初始化一下，获取商品的价格
+        this.init();
+        //var face_result=getApp().globalData.face_result;
+        //var face_data=face_result.face_list[0];
+        this.data.id = options.id;
+
+        //计算图片要显示的大小
+        th.data.cWidth = wx.getSystemInfoSync().windowWidth;
+        th.data.cHeight = wx.getSystemInfoSync().windowHeight;
+        th.data.face_height = th.data.cHeight * 0.8 * 0.8;
+
+        this.get_data(function (json, json1, img) {
+            //-- 数据先存着 --
+            var face_data = th.data.face_data = json.face_list[0];
+            var sex = json1.face_list[0].gender.type;
+            //痤疮数
+            var acne_num = face_data.acnespotmole.acne_num;
+            //色斑数
+            var speckle_num = face_data.acnespotmole.speckle_num;
+            //皱纹数
+            var wrinkle_num = face_data.wrinkle.wrinkle_num;
+            //黑头数
+            var blackhead_num = face_data.blackheadpore.blackhead_num;
+            //毛孔数
+            var pore_num = face_data.blackheadpore.pore_num;
+            //黑眼圈的严重程度
+            var dark_type = face_data.eyesattr.dark_circle_left_type.length > 0 ? face_data.eyesattr.dark_circle_left_type[0] : -1;
+            var dark_type1 = face_data.eyesattr.dark_circle_right_type.length > 0 ? face_data.eyesattr.dark_circle_right_type[0] : -1;
+            if (dark_type1 > dark_type) {
+                dark_type = dark_type1;
+            }
+            var skin_sensitive_check = parseInt(face_data.skinquality.skin_sensitive_check[0]);
+            var skin_dryoil_check = face_data.skinquality.skin_dryoil_check;
+
+            var location = face_data.location;
+            th.data.bili = th.data.face_height / (location.height + location.height / 2.3);
+
+            th.setData({
+                acne_num: acne_num,
+                speckle_num: speckle_num,
+                wrinkle_num: wrinkle_num,
+                blackhead_num: blackhead_num,
+                pore_num: pore_num,
+                dark_type: dark_type,
+                skin_sensitive_check: skin_sensitive_check,
+                skin_dryoil_check: skin_dryoil_check,
+                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,
+                sex: sex
+            })
+            var sort = 1;
+            //-- 调用毛孔的推荐函数 --
+            if (pore_num > 0)
+                pore.get_goods(th, setting.stoid, sort++);
+            //-- 调用黑头的推荐函数 --
+            if (blackhead_num > 0)
+                blackhead.get_goods(th, setting.stoid, sort++);
+            //-- 调用色斑的推荐函数 --
+            if (speckle_num > 0)
+                speckle.get_goods(th, setting.stoid, sort++);
+            //-- 调用皱纹的推荐函数 --
+            if (wrinkle_num > 0)
+                wrinkle.get_goods(th, setting.stoid, sort++);
+            //-- 黑眼圈 --
+            if (dark_type > -1)
+                dark.get_goods(th, setting.stoid, sort++);
+            //-- 黑眼圈 --
+            if (acne_num > -0)
+                acne.get_goods(th, setting.stoid, sort++);
+
+            //获取一下分享要用的图片
+            th.set_share_img();
+            acne.get_goods(th, setting.stoid);
+            let { heightRecord, tab } = th.data;
+            tab.forEach(item => {
+                console.log(2);
+                var query = th.createSelectorQuery();
+                let class_name = `.${item['id']}`;
+                query.select(class_name).boundingClientRect(function (rect) {
+                    // let ratio  = 750 / rect.width;
+                    let height = parseInt(rect.height); //加上导航栏50px
+                    heightRecord.push(height);
+                    // item['top'] = top;
+                }).exec();
+            });
+            heightRecord.sort((a, b) => {
+                return a - b;
+            });
+            th.setData({
+                heightRecord,
+            })
+            // setTimeout(() => {
+            //     heightRecord.sort((a, b) => {
+            //         return a - b;
+            //     })
+            //     let new_arr = [];
+            //     if (heightRecord.length > 0) {
+            //         heightRecord.reduce((pre, cur) => {
+            //             let sum = pre + cur;
+            //             new_arr.push(sum);
+            //             return sum;
+            //         })
+            //     }
+            //     th.setData({
+            //         heightRecord:new_arr,
+            //     })
+            // },1000)
+
+        })
+
+    },
+
+    //-- 初始等级卡 --
+    init: function () {
+        var th = this;
+        if (!getApp().globalData.user_id) return false;
+        getApp().request.get("/api/weshop/users/get/" + setting.stoid + "/" + getApp().globalData.user_id, {
+            isShowLoading: false,
+            success: function (e) {
+                if (e.data.code == 0 && e.data && e.data.data) {
+                    getApp().globalData.userInfo = e.data.data;
+                    getApp().getConfig2(function (e) {
+                        var swithc_list = e.switch_list;
+                        var sw_arr = JSON.parse(swithc_list);
+                        //---如果后台有开等级卡的开关---
+                        if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+                            th.setData({
+                                rank_switch: true
+                            });
+                            //---回调卡的列表---
+                            th.getPlusCardType(function (ob) {
+                                th.setData({
+                                    card_list: ob.card_list
+                                });
+                                var ti = setInterval(function () {
+                                    var user = getApp().globalData.userInfo;
+                                    if (!user) return false;
+                                    clearInterval(ti);
+                                    if (user.card_field && user['card_expiredate']) {
+                                        var str = user['card_expiredate'].replace(/-/g, '/');
+                                        var end = new Date(str);
+                                        end = Date.parse(end) / 1000;
+                                        var now = ut.gettimestamp();
+                                        //--- 判断是等级会员，且在有效期范围内 ---
+                                        if (user.card_field && now < end) {
+                                            var card_name = ob.name_map.get(user.card_field);
+                                            if (card_name.length > 4) card_name = card_name.substring(0, 8);
+                                            th.setData({
+                                                card_field: user.card_field,
+                                                card_name: card_name,
+                                                card_list: ob.card_list
+                                            });
+                                        }
+                                    }
+                                }, 500)
+                            })
+                        }
+                    })
+
+                }
+            }
+        })
+    },
+    //-- 获取json数据 --
+    get_data: function (func) {
+        var url = "/api/weshop/face/storeSkinface/get/" + setting.stoid + "/" + this.data.id;
+        getApp().request.promiseGet(url, {}).then(res => {
+            if (res.data.code == 0) {
+                var json = JSON.parse(res.data.data.resultjson);
+                var json1 = JSON.parse(res.data.data.detectjson);
+                func(json, json1, res.data.data.img)
+            } else {
+                getApp().showWarning("获取数据失败");
+            }
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () { },
+    set_share_img() {
+        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;
+            }
+        })
+
+    },
+    scroll_view(e) {
+        let scrollTop = e.detail.scrollTop;
+        let heightRecord = this.data.heightRecord;
+        if (heightRecord.length === 0) return;
+        let length = this.data.tab.length;
+        var index = 0;
+        if (scrollTop >= heightRecord[0]) {
+            for (let i = 0; i < length; i++) {
+                if (scrollTop >= heightRecord[i - 1] && scrollTop < heightRecord[i]) {
+                    index = i;
+                    break;
+                }
+            }
+        }
+        if (index !== this.data.currentIndex) {
+            // let tab_id = this.data.tab[index].id;
+            console.log(scrollTop);
+            this.setData({
+                scrollTop,
+                // currentIndex: index,
+            })
+        }
+
+    },
+
+    click_scroll(e) {
+        console.log(e);
+        let { index, scroll_id } = e.currentTarget.dataset;
+        this.setData({
+            scroll_index: index,
+            scroll_id,
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () { },
+
+    clickTab(e) {
+        let { index, tab_id } = e.currentTarget.dataset;
+        this.setData({
+            currentIndex: index,
+            tab_id,
+        })
+    },
+    click_yanjing() {
+        this.setData({
+            yanjing: !this.data.yanjing,
+        })
+    },
+    click_fangda() {
+        this.setData({
+            img_scale: !this.data.img_scale,
+            img_scale_icon: !this.data.yanjing,
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+    show_dailog(e) {
+        var type = parseInt(e.currentTarget.dataset.type);
+        this.setData({
+            showDialog: true, show_type: type
+        })
+        switch (type) {
+            case 1: //毛孔
+                var pore_list = this.data.face_data.blackheadpore.circles[0].pore;
+                this.setData({ pore_list: pore_list });
+                break;
+            case 2://色斑
+                var speckle_list = this.data.face_data.acnespotmole.speckle_list;
+                this.setData({ speckle_list: speckle_list });
+                break;
+            case 3://皱纹
+                var wrinkle_list = this.data.face_data.wrinkle.wrinkle_data;
+                this.setData({ wrinkle_list: wrinkle_list });
+                break;
+            case 4://黑头
+                var blackhead_list = this.data.face_data.blackheadpore.circles[0].blackhead;
+                this.setData({ blackhead_list: blackhead_list });
+                break;
+            case 5://黑眼圈
+                var arr = this.data.face_data.eyesattr.dark_circle_left[0];
+                var arr2 = this.data.face_data.eyesattr.dark_circle_right[0];
+                var arr3 = [...arr, ...arr2];
+                this.setData({ dark_list: arr3 });
+                break;
+            case 6://痤疮
+                var acne_list = this.data.face_data.acnespotmole.acne_list;
+                this.setData({ acne_list: acne_list });
+                break;
+            default:
+                break
+        }
+    },
+
+    close_dialog() {
+        this.setData({
+            showDialog: false,
+            share_flag: false,
+            img_scale: true,
+        })
+    },
+
+    close_mask() {
+        this.setData({
+            showDialog: false,
+            img_scale: true,
+        })
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    },
+
+    //商品页面跳转
+    go_url: function (e) {
+        var url = e.currentTarget.dataset.url;
+        getApp().goto(url);
+    },
+
+    //--- 获取卡类列表 ---
+    getPlusCardType: function (func) {
+        var storid = setting.stoid;
+        var th = this;
+        getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
+
+            if (res.data.code != 0 || !res.data.data) {
+                var ob = {
+                    "card_list": [],
+                    "name_map": ""
+                };
+                func(ob);
+                return false;
+            }
+
+            var plusCard = res.data.data;
+            var arr = [1219, 2089, 3031];
+            var new_arr = new Array();
+            var card_name_map = new Map();
+
+            var user = getApp().globalData.userInfo;
+            if (plusCard) {
+                for (var i = 0; i < plusCard.length; i++) {
+                    if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
+                        continue;
+                    }
+                    var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+                    card_name_map.set(name, plusCard[i].CardName);
+                    new_arr.push(plusCard[i]);
+
+                }
+            }
+            var ob = {
+                "card_list": new_arr,
+                "name_map": card_name_map
+            };
+            func(ob);
+        })
+    },
+
+    click_share() {
+        this.setData({
+            share_flag: true,
+            img_scale: false,
+            showDialog: true,
+        })
+    },
+
+    //图片加载的时候，计算图片的像素大小
+    face_img_load: function (e) {
+        var th = this;
+        var imgwidth = e.detail.width;
+        var imgheight = e.detail.height;
+
+        var w = th.data.cWidth * 0.8;
+
+        this.setData({
+            iwidth: imgwidth * th.data.bili,
+            iheight: imgheight * th.data.bili,
+            bili1: w / imgwidth  //图片放大时候的比例
+        })
+    },
+
+    //-- 图片的拖拽缩放的功能 --
+    touchstartCallback: function (e) {
+        this.data.tc_end = 0;
+        // 单手指缩放开始，也不做任何处理
+        if (e.touches.length > 1) {
+            // 一开始我并没有这个回调函数，会出现缩小的时候有瞬间被放大过程的bug
+            // 当两根手指放上去的时候，就将distance 初始化。
+            let xMove = e.touches[1].clientX - e.touches[0].clientX;
+            let yMove = e.touches[1].clientY - e.touches[0].clientY;
+            let distance = Math.sqrt(xMove * xMove + yMove * yMove);
+            this.data.img_distance = distance;
+        } else if (e.touches.length == 1) {
+            this.data.img_x = e.touches[0].clientX;
+            this.data.img_y = e.touches[0].clientY;
+        }
+
+    },
+    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;
+            let yMove = e.touches[1].clientY - e.touches[0].clientY;
+            // 新的 ditance
+            let distance = Math.sqrt(xMove * xMove + yMove * yMove);
+            let distanceDiff = distance - this.data.img_distance;
+
+            let newScale = this.data.ig_scale + 0.005 * distanceDiff
+            // 为了防止缩放得太大，所以scale需要限制，同理最小值也是
+            if (newScale >= 2) {
+                newScale = 2
+            }
+            if (newScale <= 0.6) {
+                newScale = 0.6
+            }
+
+            this.data.img_distance = distance;
+            // 赋值 新的 => 旧的
+            this.setData({
+                '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 * 0.8,
+                'img_left': xMove * 0.8,
+            });
+        }
+
+
+    },
+    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
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
+  },
+  "disableScroll": true,
   "navigationBarTitleText": "测肤报告"
 }
 \ No newline at end of file
 <wxs module="s_filter" src="s_filter.wxs"></wxs>
-
+<!-- <scroll-view enable-flex scroll-x>
+                <view style="padding: 0 50rpx 20rpx 20rpx">泪沟</view>
+                <view style="padding: 0 50rpx 20rpx 20rpx">泪沟</view>
+                <view style="padding: 0 50rpx 20rpx 20rpx">泪沟</view>
+                <view style="padding: 0 50rpx 20rpx 20rpx">泪沟</view>
+                <view style="padding: 0 50rpx 20rpx 20rpx">泪沟</view>
+            </scroll-view> -->
 <view style="height: 100rpx;">
     <scroll-view enable-flex scroll-into-view="{{tab_id}}" scroll-with-animation scroll-x class="tab_scroll">
-    <view class="flex" style="height: 100%;">
-        <view wx:for="{{tab}}" wx:key="id" id="{{item.id}}" bindtap="clickTab" data-tab_id="{{item.id}}" data-index="{{index}}" class="tab_scroll_item {{currentIndex==index?'active':''}}">
-            {{item.name}}
+        <view class="flex" style="height: 100%;">
+            <view wx:for="{{tab}}" wx:key="id" id="{{item.id}}" bindtap="clickTab" data-tab_id="{{item.id}}" data-index="{{index}}" class="tab_scroll_item {{currentIndex==index?'active':''}}">
+                {{item.name}}
+            </view>
         </view>
-    </view>
-</scroll-view>
+    </scroll-view>
 </view>
-<scroll-view enable-flex scroll-into-view="{{tab_id}}" scroll-with-animation scroll-y style="height: 100%;">
-    <view bindtap="lo" class="analyse_by_people" id="zong_he" >
+<scroll-view enable-flex enhanced scroll-into-view="{{tab_id}}" scroll-with-animation bindscroll="scroll_view" scroll-y style="height: calc(100% - 100rpx)">
+    <view class="analyse_by_people zong_he" id="zong_he">
         <view class="analyse">
             <view class="analyse_left">
                 <view class="mark">毛孔 {{pore_num}}</view>
@@ -19,7 +25,8 @@
                 <view class="mark">黑眼圈 {{s_filter.get_dark_type(dark_type)}}</view>
             </view>
             <view class="analyse_center">
-                <image src="{{iurl}}/miniapp/images/skinimg/man.png"></image>
+                <image wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv.png"></image>
+                <image wx:else src="{{iurl}}/miniapp/images/skinimg/nan.png"></image>
             </view>
             <view class="analyse_right">
                 <view class="mark">黑头 {{blackhead_num}}</view>
@@ -27,7 +34,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">
@@ -43,12 +50,12 @@
         </view>
         <view class="content" style="padding-bottom: 0;">
             <view class="mb_b5" style="display: none">
-                <image src="/packageB/images/1.png" style="height: 200rpx;width: 100%;"></image>
+                <image src="{{iurl}}/miniapp/images/skinimg/_code.png" style="height: 200rpx;width: 100%;"></image>
             </view>
             <view class="analyse_result mt_b5">
-                <!-- <view> -->
                 <view class="img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao18.jpeg" style="width: 100%;height: 100%;"></image>
+                    <image wx:if="{{sex === 'female'}}" src="{{iurl}}/miniapp/images/skinimg/nv1.jpeg" style="width: 100%;height: 100%;"></image>
+                    <image wx:else src="{{iurl}}/miniapp/images/skinimg/nan1.jpeg" style="width: 100%;height: 100%;"></image>
                 </view>
                 <view class="f1 ml20">
                     <view class="bold">待确定</view>
@@ -57,10 +64,9 @@
                         <text class="you">油性区</text>
                     </view>
                     <view class="mt20 fs26">
-                        <text>你的油性的身份骨科大夫地方官梵蒂冈反对烦得很东方红风格和的发挥</text>
+                        <text>你的皮肤总体油脂过剩，容易引发皮肤问题。日常可使用一些具有控油，补水功效产品，帮助调理肌肤</text>
                     </view>
                 </view>
-                <!-- </view> -->
             </view>
         </view>
     </view>
@@ -68,7 +74,7 @@
     <view class="content">
         <!-- 毛孔 -->
         <block wx:if="{{pore_num}}">
-           <include src="pore/pore.wxml" />
+            <include src="pore/pore" />
         </block>
         <!-- 黑头 -->
         <block wx:if="{{blackhead_num}}">
@@ -97,30 +103,30 @@
 <view class="mask" catchtap="close_mask" wx:if="{{showDialog}}"></view>
-<cover-view 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}}">
-        <view class="dialog_img">
+        <view class="dialog_img" style="{{show_type == 5?'height:60%':'height:75%'}}">
             <view class="img_content">
-                <view class="face_show_view"
-                      style="position: relative;width:{{iwidth}}px;height:{{iheight}}px;margin-top: -{{m_top}}px;margin-left: -{{m_left}}px">
-                   <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
+                <view class="face_show_view" style="position: relative;width:{{iwidth}}px;height:{{iheight}}px;margin-top: -{{m_top}}px;margin-left: -{{m_left}}px">
+                    <image src="{{iurl}}{{face_img}}" bindload="face_img_load" style="width: 100%;height: 100%;"></image>
                     <block wx:if="{{yanjing}}">
-                       <!-- 显示毛孔 -->
-                       <block wx:if="{{show_type==1}}">
-                             <block wx:for="{{pore_list}}">
-                                 <view class="abs p_circle" style="left:{{(item.x-item.r)*bili}}px; top:{{(item.y-item.r)*bili}}px; height:{{2*item.r*bili}}px;width: {{2*item.r*bili}}px"></view>
-                             </block>
-                       </block>
+                        <!-- 显示毛孔 -->
+                        <block wx:if="{{show_type==1}}">
+                            <block wx:for="{{pore_list}}">
+                                <view class="abs p_circle" style="left:{{(item.x-item.r)*bili}}px; top:{{(item.y-item.r)*bili}}px; height:{{2*item.r*bili}}px;width: {{2*item.r*bili}}px"></view>
+                            </block>
+                        </block>
                         <!-- 显示色斑 -->
                         <block wx:if="{{show_type==2}}">
-                            <block wx:for="{{speckle_list}}" >
+                            <block wx:for="{{speckle_list}}">
                                 <block wx:for="{{item.position}}" wx:for-item="bitem">
                                     <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
                                 </block>
@@ -128,15 +134,15 @@
                         </block>
                         <!-- 显示皱纹 -->
                         <block wx:if="{{show_type==3}}">
-                            <block wx:for="{{wrinkle_list}}" >
+                            <block wx:for="{{wrinkle_list}}">
                                 <block wx:for="{{item}}" wx:for-item="bitem">
-                                  <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
+                                    <view class="abs p_point" style="left:{{(bitem.x)*bili}}px; top:{{(bitem.y)*bili}}px;"></view>
                                 </block>
                             </block>
                         </block>
                         <!-- 显示黑头 -->
                         <block wx:if="{{show_type==4}}">
-                            <block wx:for="{{blackhead_list}}" >
+                            <block wx:for="{{blackhead_list}}">
                                 <block wx:for="{{item}}" wx:for-item="bitem">
                                     <view class="abs p_circle" style="left:{{(item.x-item.r)*bili}}px; top:{{(item.y-item.r)*bili}}px; height:{{2*item.r*bili}}px;width: {{2*item.r*bili}}px"></view>
                                 </block>
@@ -170,33 +176,69 @@
                 <text catchtap="click_fangda" class="iconfont icon-fangda mgb20"></text>
             </view>
         </view>
-        <view class="dialog_txt">
-            <view class="fs28" style="margin-right:15rpx;">
-                <text wx:if="{{show_type==1}}">毛孔较粗大</text>
-                <text wx:if="{{show_type==2}}">色斑轻度</text>
-                <text wx:if="{{show_type==3}}">皱纹轻度</text>
-                <text wx:if="{{show_type==4}}">黑头轻度</text>
-                <text wx:if="{{show_type==5}}">黑眼圈轻度</text>
-                <text wx:if="{{show_type==6}}">痤疮轻度</text>
-                <text wx:if="{{show_type==7}}">敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
+        <view class="dialog_txt" style="{{show_type == 5?'height:40%':'height:25%'}}">
+            <block wx:if="{{show_type == 5}}">
+                <view class="heiyanquan_img flex">
+                <view class="img1 t-c">
+                    <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nv4.jpeg"></image>
+                    <image wx:else style="width: 100%;height: 100rpx;" src="{{iurl}}/miniapp/images/skinimg/nan4.jpeg"></image>
+                    <view class="fs24">血管型 无</view>
+                </view>
+                <view class="img1 t-c">
+                    <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;"  src="{{iurl}}/miniapp/images/skinimg/nv5.jpeg"></image>
+                    <image wx:else style="width: 100%;height: 100rpx;"  src="{{iurl}}/miniapp/images/skinimg/nan5.jpeg"></image>
+                    <view  class="fs24">色素型 轻度</view>
+                </view>
+                <view class="img1 t-c">
+                    <image wx:if="{{sex === 'female' }}" style="width: 100%;height: 100rpx;"  src="{{iurl}}/miniapp/images/skinimg/nv6.jpeg"></image>
+                    <image wx:else style="width: 100%;height: 100rpx;"  src="{{iurl}}/miniapp/images/skinimg/nan6.jpeg"></image>
+                    <view class="fs24">阴影型 轻度</view>
+                </view>
             </view>
-            <view style="margin-top:2rpx;display: flex;">
-                <view class="pp"></view>
-                <view class="pp"></view>
-                <view class="pp"></view>
-                <view class="pp"></view>
-                <view class="pp"></view>
-                <view class="pp"></view>
-                <view class="pp"></view>
-                <view class="pp"></view>
-                <view class="pp"></view>
+            
+            </block>
+            <view class="dialog_progress">
+                <view style="margin-right:7px;font-size:32rpx;">
+                    <text wx:if="{{show_type==1}}">毛孔较粗大</text>
+                    <text wx:if="{{show_type==2}}">色斑轻度</text>
+                    <text wx:if="{{show_type==3}}">皱纹轻度</text>
+                    <text wx:if="{{show_type==4}}">黑头轻度</text>
+                    <text wx:if="{{show_type==5}}">黑眼圈轻度</text>
+                    <text wx:if="{{show_type==6}}">痤疮轻度</text>
+                    <text wx:if="{{show_type==7}}">敏感度{{s_filter.get_nai_shou(skin_sensitive_check)}}</text>
+                </view>
+                <view style="margin-top:10rpx;display: flex;">
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                    <view class="pp"></view>
+                </view>
             </view>
+            <scroll-view wx:if="{{show_type == 3|| show_type == 5|| show_type == 6}}" style="margin-top: 20rpx;" enable-flex scroll-into-view="scroll{{scroll_id}}" scroll-with-animation scroll-x>
+                <view class="flex fs28" style="height: 100%;">
+                    <view wx:for="{{show_type == 3?zhouwen_arr:(show_type == 5?heitanquan_arr:cuochuang_arr)}}" bindtap="click_scroll" data-scroll_id="{{item.id}}" data-index="{{index}}" wx:key="id" id="scroll{{item.id}}" class="dialog_item {{scroll_index==index?'active1':''}}">
+                        {{item.name}}
+                    </view>
+                </view>
+            </scroll-view>
         </view>
+
+
     </block>
+
+    <!-- 全图的，能够自由拖拽和放大 -->
+
     <!-- 缩小 -->
     <block wx:else>
-        <view style="position: relative">
+        <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}}">
                 <!-- 显示毛孔 -->
                 <block wx:if="{{show_type==1}}">
@@ -206,7 +248,7 @@
                 </block>
                 <!-- 显示色斑 -->
                 <block wx:if="{{show_type==2}}">
-                    <block wx:for="{{speckle_list}}" >
+                    <block wx:for="{{speckle_list}}">
                         <block wx:for="{{item.position}}" wx:for-item="bitem">
                             <view class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
                         </block>
@@ -214,7 +256,7 @@
                 </block>
                 <!-- 显示皱纹 -->
                 <block wx:if="{{show_type==3}}">
-                    <block wx:for="{{wrinkle_list}}" >
+                    <block wx:for="{{wrinkle_list}}">
                         <block wx:for="{{item}}" wx:for-item="bitem">
                             <view class="abs p_point" style="left:{{(bitem.x)*bili1}}px; top:{{(bitem.y)*bili1}}px;"></view>
                         </block>
@@ -223,7 +265,7 @@
                 <!-- 显示黑头 -->
                 <block wx:if="{{show_type==4}}">
-                    <block wx:for="{{blackhead_list}}" >
+                    <block wx:for="{{blackhead_list}}">
                         <block wx:for="{{item}}" wx:for-item="bitem">
                             <view class="abs p_circle" style="left:{{(item.x-item.r)*bili1}}px; top:{{(item.y-item.r)*bili1}}px; height:{{2*item.r*bili1}}px;width: {{2*item.r*bili1}}px"></view>
                         </block>
@@ -253,3 +295,19 @@
         </view>
     </block>
 </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
@@ -44,10 +44,34 @@ page {
     background-color: #333333;
 }
+.dialog_item.active1 {
+    color: #45d4eb;
+}
+
+.dialog_item.active1::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 25%;
+    height: 6rpx;
+    background-color: #45d4eb;
+}
+
 .analyse {
     display: flex;
     align-items: center;
     margin-top: 50rpx;
+    justify-content: center;
+    /* justify-content: space-evenly; */
+}
+
+.analyse1 {
+    display: flex;
+    align-items: center;
+    margin: 50rpx 0 100rpx 0;
+    justify-content: center;
     /* justify-content: space-evenly; */
 }
@@ -58,6 +82,13 @@ page {
     border-radius: 20rpx;
 }
+.analyse1 .mark1 {
+    padding: 3rpx;
+    font-size: 24rpx;
+    background: #fff;
+    border-radius: 20rpx;
+}
+
 .analyse .analyse_left {
     position: relative;
     right: -70rpx;
@@ -72,6 +103,26 @@ page {
     height: 400rpx;
 }
+.analyse1 .analyse_center1 {
+    position: relative;
+    background: #c9f0f9;
+    border-radius: 50%;
+    width: 300rpx;
+    height: 300rpx;
+}
+
+.analyse1 .analyse_left1 {
+    position: relative;
+    right: -25rpx;
+    z-index: 2;
+}
+
+.analyse1 .analyse_right1 {
+    position: relative;
+    right: 25rpx;
+    z-index: 2;
+}
+
 .analyse_center .lianxian {
     position: absolute;
     width: 2rpx;
@@ -302,6 +353,22 @@ page {
     background-color: rgb(193 235 241 / 50%)
 }
+.renzheng {
+    position: relative;
+    font-size: 38rpx;
+    font-weight: 600;
+}
+
+.renzheng::after {
+    position: absolute;
+    content: "";
+    bottom: 0;
+    display: block;
+    width: 100%;
+    height: 20rpx;
+    background-color: rgb(193 235 241 / 50%)
+}
+
 .analyse_classify_foot .shoushu {
     padding: 5%;
     display: flex;
@@ -381,23 +448,51 @@ page {
     top: 50%;
     right: 50%;
     transform: translate(50%, -50%);
-    height: 70%;
+    height: 80%;
     width: 80%;
-    border-radius: 30rpx;
+    border-top-left-radius: 12rpx;
+    border-top-right-radius: 12rpx;
     z-index: 99999999;
+    overflow: hidden;
 }
 .dialog .dialog_img {
-    height: 84%;
+    height: 75%;
     position: relative;
 }
 .dialog .dialog_txt {
     display: flex;
-    align-items: center;
-    justify-content: center;
+    flex-direction: column;
+    justify-content: space-evenly;
+    background-color: #fff;
+    min-height: 25%;
+}
+
+.dialog_txt .heiyanquan_img {
+    justify-content: space-between;
+    padding: 2%;
+}
+.dialog_txt .heiyanquan_img .img1 {
+    width: 32%;
+}
+
+.dialog .dialog_progress {
+    display: flex;
+    align-self: center;
+}
+
+.dialog .dialog_bottom {
+    display: flex;
+    width: 130%;
+    background-color: #fff;
+}
+
+.dialog_item {
+    position: relative;
+    padding: 3% 6%;
+    white-space: nowrap;
     background-color: #fff;
-    min-height: 20%;
 }
 .dialog .dialog_icon {
@@ -415,7 +510,7 @@ page {
     justify-content: center;
     align-items: center;
     color: #fff;
-    background-color: #1f1919;
+    background-color: #333;
     border-radius: 50%;
     width: 50rpx;
     height: 50rpx;
@@ -423,8 +518,8 @@ page {
 .pp {
     width: 8rpx;
-    height: 35rpx;
-    margin-right: 5rpx;
+    height: 40rpx;
+    margin-right: 8rpx;
     border-radius: 3rpx;
     background: #2cb344;
 }
@@ -481,7 +576,7 @@ page {
     left: 205rpx;
     width: 30rpx;
     height: 30rpx;
-    background: #fff;
+    background: #e6f4fa;
     overflow: hidden;
 }
@@ -520,7 +615,7 @@ page {
 }
 .background {
-    background: #f40028;
+    background: #45d4eb;
 }
 .xc-get {
@@ -541,13 +636,91 @@ page {
     left: 205rpx;
     width: 30rpx;
     height: 30rpx;
-    background: #fff;
+    background: #e6f4fa;
 }
-.abs{position: absolute}
-.p_circle{ border: 1rpx solid #c8162c;border-radius: 50%}
-.p_point{background-color:#c8162c;height:2px;width:2px}
+.abs {
+    position: absolute
+}
+
+.p_circle {
+    border: 1rpx solid #c8162c;
+    border-radius: 50%
+}
+
+.p_point {
+    background-color: #c8162c;
+    height: 2px;
+    width: 2px
+}
 .xc-spacing {
     letter-spacing: 4rpx;
+}
+
+.share_dialog {
+    background: #e8f5fd;
+    width: 600rpx;
+    height: 700rpx;
+    padding: 40rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+}
+
+.share_dialog .share_dialog_center {
+    width: 400rpx;
+    height: 400rpx;
+    margin: 30rpx 0;
+    align-self: center;
+}
+
+.share_dialog .share_dialog_bottom {
+    background: #fff;
+    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
-/*
- * @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});
            }
          })
 	},
-<view class="mb_b5" id="zhou_wen">
+<view class="mb_b5 zhou_wen" id="zhou_wen">
     <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;">
@@ -13,11 +13,11 @@
             </view>
             <view class="analyse_classify_header_item mt_b5">
                 <view class="analyse_classify_header_img">
-                    <image src="{{iurl}}/miniapp/images/skinimg/mao123.png"></image>
+                    <image src="{{iurl}}/miniapp/images/skinimg/zhouwen.png"></image>
                 </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;">
@@ -30,7 +30,8 @@
                     </view>
                 </view>
                 <view class="analyse_center" style="width: 250rpx;height: 250rpx;">
-                    <image src="{{iurl}}/miniapp/images/skinimg/man10.jpeg"></image>
+                    <image wx:if="{{sex === 'male'}}" src="{{iurl}}/miniapp/images/skinimg/nan2.jpeg"></image>
+                    <image wx:else src="{{iurl}}/miniapp/images/skinimg/nv2.jpeg"></image>
                     <view class="lianxian"></view>
                     <view class="lianxian1"></view>
                     <view class="lianxian2"></view>
@@ -49,7 +50,7 @@
                 </view>
             </view>
             <view class="fs28 mt_b10">
-                <text>明显可见毛孔或内含小于毛孔大小角栓</text>
+                <text>隐约可见皱纹</text>
             </view>
         </view>
         <view class="analyse_classify_body">
@@ -115,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>
@@ -430,7 +430,8 @@ Page({
           storeId: a.stoid,
           userId: d.user_id,
           serviceId: itemid,
-          storageId: storageId
+          storageId: storageId,
+          VipId:getApp().globalData.userInfo.erpvipid,
         }
       }).then(res => {
         wx.hideLoading();
@@ -19,7 +19,7 @@ Page({
     comment: "", //美容师评价
     aweeks: [], //七天的预约时间
     head_img: "", //美容师头像
-    time:['08:00','08:30', '09:00', '09:30', '10:00', '10:30', '11:00', '11:30', '12:00', '12:30', '13:00', '13:30', '14:00','14:30', '15:00',  '15:30', '16:00', '16:30', '17:00','17:30', '18:00','18:30', '19:00', '19:30', '20:00',  '20:30', '21:00', '21:30', '22:00','22:30'],
+    time: ['08:00', '08:30', '09:00', '09:30', '10:00', '10:30', '11:00', '11:30', '12:00', '12:30', '13:00', '13:30', '14:00', '14:30', '15:00', '15:30', '16:00', '16:30', '17:00', '17:30', '18:00', '18:30', '19:00', '19:30', '20:00', '20:30', '21:00', '21:30', '22:00', '22:30'],
     weeks: [], //星期几数组
     time_index: -1, //选择预约时间下标
     date_id: 0, //选择日期的id
@@ -36,22 +36,22 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
     var th = this;
     var myDate = new Date();
     var minutes = myDate.getMinutes(); //获取当前分钟数(0-59)
     var hours = myDate.getHours() + ":" + minutes; //获取当前小时数(0-23)
     var beautician_id = options.BeauticianID;
     var storageId = options.StorageId;
-	
-	
+
+
     th.setData({
       beautician_id: beautician_id,
       itemId: options.itemId,
       modify: options.modify,
       hours: hours,
       projectId: options.projectId,
-	  storageId:storageId
+      storageId: storageId
     })
     if (options.url != undefined) {
       th.setData({
@@ -68,17 +68,17 @@ Page({
         iscos: options.iscos
       })
     }
-    if (options.StaffName!=undefined){
+    if (options.StaffName != undefined) {
       th.setData({
         StaffName: options.StaffName
       })
     }
-    th.query_beatea(th.query_aweek);  
+    th.query_beatea(th.query_aweek);
   },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function () {
     var th = this;
     //获取当前时间
     var myDate = new Date();
@@ -91,7 +91,7 @@ Page({
   },
   //图片失败，默认图片
-  bind_bnerr1: function(e) {
+  bind_bnerr1: function (e) {
     var _errImg = e.target.dataset.errorimg;
     var _Img = e.target.dataset.img;
     if (_Img != undefined) {
@@ -101,7 +101,7 @@ Page({
     }
   },
   //选择服务日期
-  check_date: function(e) {
+  check_date: function (e) {
     var th = this;
     var id = e.currentTarget.dataset.dateid;
     var date_id = th.data.date_id;
@@ -115,7 +115,7 @@ Page({
     }
   },
   //获取美容师信息
-  query_beatea: function(func) {
+  query_beatea: function (func) {
     var th = this;
     var url = "/api/weshop/marketing/reservation/staff/get"; //接口路径
     var beautician_id = th.data.beautician_id;
@@ -127,23 +127,23 @@ Page({
     }).then(res => {
       if (res.data.code == 0) {
         var data = res.data.data;
-		var ob={
+        var ob = {
           name: data.StaffName,
           comment: data.Remark1,
           head_img: data.PhotoUrl
-        };		
-		if(!th.data.storageId){
-			ob.storageId=data.StorageId;
-		}			
+        };
+        if (!th.data.storageId) {
+          ob.storageId = data.StorageId;
+        }
         th.setData(ob);
-		func();
+        func();
       } else {
         getApp().my_warnning(res.data.msg, 0, th);
       }
     })
   },
   //返回上个页面
-  navigateBack: function() {
+  navigateBack: function () {
     var th = this;
     var modify = th.data.modify; //是否是更改时间
     var seekTime = th.data.seekTime; //选择的日期
@@ -162,7 +162,7 @@ Page({
         "number": th.data.number,
         "remark": "更改时间",
         "states": 0,
-        "storeId": a.stoid
+        "storeId": a.stoid,
       };
       var data = JSON.stringify(json);
       var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
@@ -173,10 +173,10 @@ Page({
         header: {
           'content-type': 'application/json'
         }, // 设置请求的 header
-        success: function(res) {
+        success: function (res) {
           if (res.data.code == 0) {
             getApp().my_warnning(res.data.data, 1, th);
-            setTimeout(function() {
+            setTimeout(function () {
               wx.navigateBack({
                 //返回
                 delta: 1
@@ -218,7 +218,7 @@ Page({
     }
   },
   //选择时间
-  Selection_time: function(e) {
+  Selection_time: function (e) {
     var th = this;
     var index = e.currentTarget.dataset.index;
     var time_index = th.data.time_index;
@@ -231,11 +231,11 @@ Page({
     }
   },
   //查询七天预约时间
-  query_aweek: function() {
+  query_aweek: function () {
     var th = this;
     var beautician_id = th.data.beautician_id; //美容师id
-	var storageId=th.data.storageId;
-		
+    var storageId = th.data.storageId;
+
     var itemId = th.data.itemId; //服务id
     var projectId = th.data.projectId; //项目id
     var number = th.data.number; //预约单号
@@ -246,8 +246,9 @@ Page({
         beauticianId: beautician_id,
         serviceId: itemId,
         storeId: a.stoid,
-    storageId:storageId,
-    number: number
+        storageId: storageId,
+        number: number,
+        VipId: getApp().globalData.userInfo.erpvipid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -287,7 +288,7 @@ Page({
   },
-  query_date: function() {
+  query_date: function () {
     var th = this;
     var projectId = th.data.projectId;
     var date_id = th.data.date_id; //日期下标
@@ -299,11 +300,12 @@ Page({
       data: {
         projectId: projectId,
         staffId: th.data.beautician_id,
-		storageId:th.data.storageId,
+        storageId: th.data.storageId,
         serviceId: th.data.itemId,
         seekTime: SeekTime,
         storeId: a.stoid,
-        number:number,
+        number: number,
+        VipId: getApp().globalData.userInfo.erpvipid,
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -312,11 +314,11 @@ Page({
         var time = th.data.time;
         var date_id = th
         var new_time = [];
-        var date = th.data.hours.substring(0,2);
+        var date = th.data.hours.substring(0, 2);
         //不等于空就是有可以预约的时间
         if (time_list != null) {
-          if (res.data.data && res.data.data[0]!= undefined) {
+          if (res.data.data && res.data.data[0] != undefined) {
             if (res.data.data[0].GroupHour && res.data.data[0].GroupHour.length > 11) {
               getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
             }
@@ -330,7 +332,7 @@ Page({
                 if (date > time_list[ii].begintime.substring(0, 2) && date_id == 0) {
                   new_time[i] = "";
                   break;
-                }else{
+                } else {
                   new_time[i] = time_list[ii].begintime.substring(0, 5);
                   break;
                 }
@@ -339,9 +341,9 @@ Page({
               }
             }
           }
-        }else{
-          for(var i = 0 ;i<time.length;i++){
-            new_time[i]="";
+        } else {
+          for (var i = 0; i < time.length; i++) {
+            new_time[i] = "";
           }
         }
         th.setData({
@@ -354,7 +356,7 @@ Page({
   },
   //更改预约时间
-  change_time: function() {
+  change_time: function () {
     var th = this;
     var seekTime = th.data.seekTime; //选择的日期
     var time_list = th.data.time_list;
@@ -377,7 +379,7 @@ Page({
       header: {
         'content-type': 'application/json'
       }, // 设置请求的 header
-      success: function(res) {
+      success: function (res) {
         if (res.data.code == 0) {
           getApp().my_warnning("更改成功", 0, th);
         } else {
@@ -387,7 +389,7 @@ Page({
     })
   },
   //预览头像
-  previewImage: function(e) {
+  previewImage: function (e) {
     var th = this;
     var current = e.currentTarget.dataset.src;
     wx.previewImage({
@@ -396,7 +398,7 @@ Page({
     })
   },
-  sort_arr: function(a, b) {
+  sort_arr: function (a, b) {
     a = a['time'];
     b = b['time'];
     if (a < b) {
@@ -407,16 +409,16 @@ Page({
     }
     return 0;
   },
-  
-  check_is_in_arr:function(val,pdata) {
-          if(!val || !pdata) return false;
-          for(var i in pdata){
-              if(pdata[i].begintime.indexOf(val)!=-1){
-                  return true;
-              }
-          }
-          return false;
-   }
+
+  check_is_in_arr: function (val, pdata) {
+    if (!val || !pdata) return false;
+    for (var i in pdata) {
+      if (pdata[i].begintime.indexOf(val) != -1) {
+        return true;
+      }
+    }
+    return false;
+  }