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

后端研发-苏泰源
2 parents 9b786dd2 510ed25a
Showing 26 changed files with 977 additions and 262 deletions
app.json
packageB/pages/AI-test-skin/analyse/analyse.js
packageB/pages/AI-test-skin/analyse/analyse.json
packageB/pages/AI-test-skin/analyse/analyse.wxml
packageB/pages/AI-test-skin/analyse/analyse.wxss
packageB/pages/AI-test-skin/fail_result/fail_result.js
packageB/pages/AI-test-skin/fail_result/fail_result.json
packageB/pages/AI-test-skin/fail_result/fail_result.wxml
packageB/pages/AI-test-skin/fail_result/fail_result.wxss
packageB/pages/AI-test-skin/history_record/history_record.js
packageB/pages/AI-test-skin/history_record/history_record.json
packageB/pages/AI-test-skin/history_record/history_record.wxml
packageB/pages/AI-test-skin/history_record/history_record.wxss
packageB/pages/AI-test-skin/index/aiskin.wxml
packageB/pages/AI-test-skin/select_photo/select_photo.js
packageB/pages/AI-test-skin/select_photo/select_photo.json
packageB/pages/AI-test-skin/select_photo/select_photo.wxml
packageB/pages/AI-test-skin/select_photo/select_photo.wxss
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml
 {
-  "pages": [
-    "pages/index/index/index",
-    "pages/goods/categoryList/categoryList",
-    "pages/cart/cart/cart",
-    "pages/cart/cart2/cart2",
-    "pages/cart/cart4/cart4",
-    "pages/goods/goodsInfo/goodsInfo",
-    "pages/goods/goodsList/goodsList",
-    "pages/goods/search/search",
-    "pages/order/refund_order/refund_order",
-    "pages/payment/payment/payment",
-    "pages/user/index/index",
-    "pages/user/order_list/order_list",
-    "pages/user/order_detail/order_detail",
-    "pages/user/address_list/address_list",
-    "pages/user/userinfo/userinfo",
-    "pages/user/return_goods_list/return_goods_list",
-    "pages/user/coupon/coupon",
-    "pages/user/checkcoupon/checkcoupon",
-    "pages/user/add_address/add_address",
-    "pages/user/withdrawals_list/withdrawals_list",  
-    "pages/user/return_goods_info/return_goods_info",
-    "pages/user/return_goods/return_goods",
-    "pages/user/withdrawals/withdrawals",
-    "pages/user/express/express",
-    "pages/user/get_user_info/get_user_info",
-    "pages/activity/seckill_list/seckill_list",
-    "pages/activity/pind_list/pind_list",
-    "pages/togoin/togoin",
-    "pages/team/team_success/team_success",
-    "pages/team/team_show/team_show",
-    "pages/team/team_ping/team_ping",
-    "pages/cart/cart2_pt/cart2_pt",
-    "pages/cart/cart_wk/cart_wk",
-    "pages/user/member/menber",
-    "pages/user/member/bring/bring",
-    "pages/user/member/bring/msg/msg",
-    "pages/user/member/account/account",
-    "pages/user/member/account_unable/account_unable",
-    "pages/user/member/cash_record/cash_record",
-    "pages/user/coupons/coupons",
-    "pages/user/integral/integral",
-    "pages/user/integral/query/index",
-    "pages/user/integral/msg/msg",
-    "pages/user/userqy/userqy",
-    "pages/user/user_spsy/user_spsy",
-    "pages/user/user_fw/user_fw",  
-    "pages/user/grow_value/grow_value",
-    "pages/payment/pay_success/pay_success",
-    "pages/user/plus/plus",
-    "pages/user/cardinfo/cardinfo",
-    "pages/user/Detailed/Detailed",   
-    "pages/user/my_service/appment_main",
-    "pages/user/my_service/i_service",
-    "pages/user/my_service/cosmetology_list",
-    "pages/user/my_service/hist_service",
-    "pages/user/my_service/tment_details",
-    "pages/user/my_service/tment_eval",
-    "pages/user/my_service/tment_order_list",
-    "pages/user/my_service/beauty_deta",
-    "pages/user/labels/labels",  
-    "pages/giftpack/birthdaygift/birthdaygift", 
-    "pages/giftpack/evaluategift/evaluategift",
-    "pages/giftpack/newvipgift/newvipgift",
-    "pages/giftpack/payment/payment",
-    "pages/giftpack/buygiftpack/giftpackbuy",
-    "pages/giftpack/giftpacklist/giftpacklist",
-    "pages/giftpack/mygiftpack/mygiftpack",
-    "pages/user/assistance/giftpacklist",
-    "pages/user/assistance/task_assistance",
-    "pages/user/assistance/friend_assistance",
-    "pages/user/assistance/assistance_success",
-    "pages/user/assistance/assistance",
-    "pages/template/index",
-    "pages/store/index",
-		"pages/cart/cart2_inte/cart2_inte",
-		"pages/giftpack/festival/festival",
-		"pages/team/team_more/team_more",
-		"pages/user/deposit/deposit",
-		"pages/user/deposit/prepaid/msg/msg",
-		"pages/user/deposit/prepaid/prepaid",
-		"pages/distribution/distribution"
-  ],
-  "subPackages": [{
-      "root": "packageA/",
-      "name":"pack1",
-      "pages": [            
-         "pages/prom_list/prom_list",
-         "pages/quan_list/quan_list",
-         "pages/quan_pro/quan_pro",
-         "pages/liveStream/liveStream",
-         "pages/liveStreamDetails/liveStreamDetails",
-				 "pages/addCustomer/addCustomer",
-				 "pages/goods_share/goods_share",
-				 "pages/activity_share/activity_share",
-				 "pages/live_share/live_share",				
-				 "pages/quan/quan",
-				 "pages/chongzhi/chongzhi",
-				 "pages/chongzhiDetails/chongzhiDetails",
-				 "pages/jfbuy/jfbuy",
-				 "pages/hongBao/hongBao",
-				 "pages/hongBaoDetails/hongBaoDetails",
-				 "pages/service_record/service_record",
-				 "pages/checkin/checkin",
-				 "pages/distribution/myteam/myteam",
-				 "pages/distribution/order/order",
-				 "pages/distribution/commision/commision",
-				 "pages/distribution/rank/rank",
-				 "pages/distribution/card/card",
-				 "pages/distribution/goods/goods",
-				 "pages/distribution/shop/shop",
-				 "pages/distribution/rookie/rookie",
-				 "pages/service_share/service_share",
-				 "pages/cardList/cardList",
-				 "pages/goodsInfo/goodsInfo",
-				 "pages/my_service/appment_main",
-				 "pages/my_service/i_service",
-				 "pages/my_service/cosmetology_list",
-				 "pages/my_service/hist_service",
-				 "pages/my_service/tment_details",
-				 "pages/my_service/tment_eval",
-				 "pages/my_service/tment_order_list",
-				 "pages/my_service/beauty_deta",
-				 "pages/my_service2/appment_main",
-				 "pages/profile/profile",
-				 "pages/parseHtml/parseHtml",
-				 "pages/myGift/myGift",
-				 "pages/myGiftDetails/myGiftDetails",
-				 "pages/cart2_ser/cart2_ser",
-         "pages/libao_payment/payment",
-				 "pages/details_serviceCard/details_serviceCard"
-      ]
-      
-  },
-  {
-    "root": "packageB/",
-    "name":"pack2",
-    "pages": [            
-      "pages/user/collect_list/collect_list",
-      "pages/user/comment/comment",
-      "pages/user/view_comment/view_comment",
-      "pages/user/add_comment/add_comment",
-      "pages/user/user_coupon/user_coupon",
-			"pages/user/buyDetails/buyDetails",
-			"pages/evaluate/evaluate",
-			"pages/evaluate_list/evaluate_list",
-			"pages/luckactivity/luckinfo/luckinfo",
-      "pages/luckactivity/index/index",
-      "pages/user/Change_phone/Change_phone",
-      "pages/zuhegou/index/index",
-			"pages/zuhegou/list/list",
-      "pages/user/binding_info/binding_info",
-      "pages/user/choice_guide/choice_guide",
-      "pages/video/index",
-      "pages/boxes-list/boxes-list",
-			"pages/boxes-details/boxes-details"
-    ] 
-},
-{
-  "root": "packageC/",
-  "name":"pack3",
-  "pages": [
-	"pages/group_list/group_list",
-  "pages/presell/list/list",
-  "pages/presell/cart/cart",
-  "pages/presell/cart/cart2",
-  "pages/presell/cart/cart2_pre",
-  "pages/presell/goodsInfo/goodsInfo",
-  "pages/goods/distributionCategoryList/index",
-  "pages/goods/goodsList/goodsList",
-  "pages/payForAnother/payForAnother",
-	"pages/luckyGo/luckyGo_cart/luckyGo_cart",
-	"pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct",
-	"pages/luckyGo/luckyGo_list/luckyGo_list",
-	"pages/luckyGo/luckyGo_order/luckyGo_order",
-	"pages/luckyGo/luckyGo_details/luckyGo_details",
-	"pages/luckyGo/luckyGo_winners/luckyGo_winners",
-	"pages/luckyGo/luckyGo_members/luckyGo_members",
-	"pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo",
-	"pages/luckyGo/luckyGo_activityList/luckyGo_activityList"
-  ]  
-}
-
-],
-  "permission": {
-    "scope.userLocation": {
-      "desc": "获取你的位置信息"
-    }
-  },
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "加载中...",
-    "navigationBarBackgroundColor": "#ffffff",
-    "backgroundColor": "#ffffff",
-    "enablePullDownRefresh": true
-		
-  },
-  
-  "tabBar": {
-	  "custom":true,
-      "color": "#6e6d6b",
-      "selectedColor": "#f23030",
-      "borderStyle": "white",
-      "backgroundColor": "#ffffff",
-      "list": [
+    "pages": [
+        "pages/index/index/index",
+        "pages/goods/categoryList/categoryList",
+        "pages/cart/cart/cart",
+        "pages/cart/cart2/cart2",
+        "pages/cart/cart4/cart4",
+        "pages/goods/goodsInfo/goodsInfo",
+        "pages/goods/goodsList/goodsList",
+        "pages/goods/search/search",
+        "pages/order/refund_order/refund_order",
+        "pages/payment/payment/payment",
+        "pages/user/index/index",
+        "pages/user/order_list/order_list",
+        "pages/user/order_detail/order_detail",
+        "pages/user/address_list/address_list",
+        "pages/user/userinfo/userinfo",
+        "pages/user/return_goods_list/return_goods_list",
+        "pages/user/coupon/coupon",
+        "pages/user/checkcoupon/checkcoupon",
+        "pages/user/add_address/add_address",
+        "pages/user/withdrawals_list/withdrawals_list",
+        "pages/user/return_goods_info/return_goods_info",
+        "pages/user/return_goods/return_goods",
+        "pages/user/withdrawals/withdrawals",
+        "pages/user/express/express",
+        "pages/user/get_user_info/get_user_info",
+        "pages/activity/seckill_list/seckill_list",
+        "pages/activity/pind_list/pind_list",
+        "pages/togoin/togoin",
+        "pages/team/team_success/team_success",
+        "pages/team/team_show/team_show",
+        "pages/team/team_ping/team_ping",
+        "pages/cart/cart2_pt/cart2_pt",
+        "pages/cart/cart_wk/cart_wk",
+        "pages/user/member/menber",
+        "pages/user/member/bring/bring",
+        "pages/user/member/bring/msg/msg",
+        "pages/user/member/account/account",
+        "pages/user/member/account_unable/account_unable",
+        "pages/user/member/cash_record/cash_record",
+        "pages/user/coupons/coupons",
+        "pages/user/integral/integral",
+        "pages/user/integral/query/index",
+        "pages/user/integral/msg/msg",
+        "pages/user/userqy/userqy",
+        "pages/user/user_spsy/user_spsy",
+        "pages/user/user_fw/user_fw",
+        "pages/user/grow_value/grow_value",
+        "pages/payment/pay_success/pay_success",
+        "pages/user/plus/plus",
+        "pages/user/cardinfo/cardinfo",
+        "pages/user/Detailed/Detailed",
+        "pages/user/my_service/appment_main",
+        "pages/user/my_service/i_service",
+        "pages/user/my_service/cosmetology_list",
+        "pages/user/my_service/hist_service",
+        "pages/user/my_service/tment_details",
+        "pages/user/my_service/tment_eval",
+        "pages/user/my_service/tment_order_list",
+        "pages/user/my_service/beauty_deta",
+        "pages/user/labels/labels",
+        "pages/giftpack/birthdaygift/birthdaygift",
+        "pages/giftpack/evaluategift/evaluategift",
+        "pages/giftpack/newvipgift/newvipgift",
+        "pages/giftpack/payment/payment",
+        "pages/giftpack/buygiftpack/giftpackbuy",
+        "pages/giftpack/giftpacklist/giftpacklist",
+        "pages/giftpack/mygiftpack/mygiftpack",
+        "pages/user/assistance/giftpacklist",
+        "pages/user/assistance/task_assistance",
+        "pages/user/assistance/friend_assistance",
+        "pages/user/assistance/assistance_success",
+        "pages/user/assistance/assistance",
+        "pages/store/index",
+        "pages/cart/cart2_inte/cart2_inte",
+        "pages/giftpack/festival/festival",
+        "pages/team/team_more/team_more",
+        "pages/user/deposit/deposit",
+        "pages/user/deposit/prepaid/msg/msg",
+        "pages/user/deposit/prepaid/prepaid",
+        "pages/distribution/distribution",
+        "pages/template/index"
+    ],
+    "subPackages": [
         {
-          "pagePath": "pages/index/index/index",
-          "text": "首页",
-          "iconPath": "packageA/images/bar/index.png",
-          "selectedIconPath": "packageA/images/bar/index_on.png"
+            "root": "packageA/",
+            "name": "pack1",
+            "pages": [
+                "pages/prom_list/prom_list",
+                "pages/quan_list/quan_list",
+                "pages/quan_pro/quan_pro",
+                "pages/liveStream/liveStream",
+                "pages/liveStreamDetails/liveStreamDetails",
+                "pages/addCustomer/addCustomer",
+                "pages/goods_share/goods_share",
+                "pages/activity_share/activity_share",
+                "pages/live_share/live_share",
+                "pages/quan/quan",
+                "pages/chongzhi/chongzhi",
+                "pages/chongzhiDetails/chongzhiDetails",
+                "pages/jfbuy/jfbuy",
+                "pages/hongBao/hongBao",
+                "pages/hongBaoDetails/hongBaoDetails",
+                "pages/service_record/service_record",
+                "pages/checkin/checkin",
+                "pages/distribution/myteam/myteam",
+                "pages/distribution/order/order",
+                "pages/distribution/commision/commision",
+                "pages/distribution/rank/rank",
+                "pages/distribution/card/card",
+                "pages/distribution/goods/goods",
+                "pages/distribution/shop/shop",
+                "pages/distribution/rookie/rookie",
+                "pages/service_share/service_share",
+                "pages/cardList/cardList",
+                "pages/goodsInfo/goodsInfo",
+                "pages/my_service/appment_main",
+                "pages/my_service/i_service",
+                "pages/my_service/cosmetology_list",
+                "pages/my_service/hist_service",
+                "pages/my_service/tment_details",
+                "pages/my_service/tment_eval",
+                "pages/my_service/tment_order_list",
+                "pages/my_service/beauty_deta",
+                "pages/my_service2/appment_main",
+                "pages/profile/profile",
+                "pages/parseHtml/parseHtml",
+                "pages/myGift/myGift",
+                "pages/myGiftDetails/myGiftDetails",
+                "pages/cart2_ser/cart2_ser",
+                "pages/libao_payment/payment",
+                "pages/details_serviceCard/details_serviceCard"
+            ]
         },
         {
-          "pagePath": "pages/goods/categoryList/categoryList",
-          "text": "分类",
-          "iconPath": "packageA/images/bar/fl.png",
-          "selectedIconPath": "packageA/images/bar/fl_on.png"
+            "root": "packageB/",
+            "name": "pack2",
+            "pages": [
+                "pages/user/collect_list/collect_list",
+                "pages/user/comment/comment",
+                "pages/user/view_comment/view_comment",
+                "pages/user/add_comment/add_comment",
+                "pages/user/user_coupon/user_coupon",
+                "pages/user/buyDetails/buyDetails",
+                "pages/evaluate/evaluate",
+                "pages/evaluate_list/evaluate_list",
+                "pages/luckactivity/luckinfo/luckinfo",
+                "pages/luckactivity/index/index",
+                "pages/user/Change_phone/Change_phone",
+                "pages/zuhegou/index/index",
+                "pages/zuhegou/list/list",
+                "pages/user/binding_info/binding_info",
+                "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"
+            ]
         },
-				{
-				  "pagePath": "pages/distribution/distribution",
-				  "text": "分销",
-				  "iconPath": "packageA/images/bar/fx.png",
-				  "selectedIconPath": "packageA/images/bar/fx_on.png"
-				},
         {
-          "pagePath": "pages/cart/cart/cart",
-          "text": "购物车",
-          "iconPath": "packageA/images/bar/car.png",
-          "selectedIconPath": "packageA/images/bar/car_on.png"
-        },
-        {
-          "pagePath": "pages/user/index/index",
-          "text": "我的",
-          "iconPath": "packageA/images/bar/user.png",
-          "selectedIconPath": "packageA/images/bar/user_on.png"
+            "root": "packageC/",
+            "name": "pack3",
+            "pages": [
+                "pages/group_list/group_list",
+                "pages/presell/list/list",
+                "pages/presell/cart/cart",
+                "pages/presell/cart/cart2",
+                "pages/presell/cart/cart2_pre",
+                "pages/presell/goodsInfo/goodsInfo",
+                "pages/goods/distributionCategoryList/index",
+                "pages/goods/goodsList/goodsList",
+                "pages/payForAnother/payForAnother",
+                "pages/luckyGo/luckyGo_cart/luckyGo_cart",
+                "pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct",
+                "pages/luckyGo/luckyGo_list/luckyGo_list",
+                "pages/luckyGo/luckyGo_order/luckyGo_order",
+                "pages/luckyGo/luckyGo_details/luckyGo_details",
+                "pages/luckyGo/luckyGo_winners/luckyGo_winners",
+                "pages/luckyGo/luckyGo_members/luckyGo_members",
+                "pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo",
+                "pages/luckyGo/luckyGo_activityList/luckyGo_activityList"
+            ]
+        }
+    ],
+    "permission": {
+        "scope.userLocation": {
+            "desc": "获取你的位置信息"
         }
-      ]
-   },
-  "debug": false,
-  "sitemapLocation": "sitemap.json",
-  "usingComponents": {
-	  "customtabbar":"custom-tab-bar/index"
-  },
+    },
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "加载中...",
+        "navigationBarBackgroundColor": "#ffffff",
+        "backgroundColor": "#ffffff",
+        "enablePullDownRefresh": true
+    },
+    "tabBar": {
+        "custom": true,
+        "color": "#6e6d6b",
+        "selectedColor": "#f23030",
+        "borderStyle": "white",
+        "backgroundColor": "#ffffff",
+        "list": [
+            {
+                "pagePath": "pages/index/index/index",
+                "text": "首页",
+                "iconPath": "packageA/images/bar/index.png",
+                "selectedIconPath": "packageA/images/bar/index_on.png"
+            },
+            {
+                "pagePath": "pages/goods/categoryList/categoryList",
+                "text": "分类",
+                "iconPath": "packageA/images/bar/fl.png",
+                "selectedIconPath": "packageA/images/bar/fl_on.png"
+            },
+            {
+                "pagePath": "pages/distribution/distribution",
+                "text": "分销",
+                "iconPath": "packageA/images/bar/fx.png",
+                "selectedIconPath": "packageA/images/bar/fx_on.png"
+            },
+            {
+                "pagePath": "pages/cart/cart/cart",
+                "text": "购物车",
+                "iconPath": "packageA/images/bar/car.png",
+                "selectedIconPath": "packageA/images/bar/car_on.png"
+            },
+            {
+                "pagePath": "pages/user/index/index",
+                "text": "我的",
+                "iconPath": "packageA/images/bar/user.png",
+                "selectedIconPath": "packageA/images/bar/user_on.png"
+            }
+        ]
+    },
+    "debug": false,
+    "sitemapLocation": "sitemap.json",
+    "usingComponents": {
+        "customtabbar": "custom-tab-bar/index"
+    },
     "useExtendedLib": {
-      "weui": true
+        "weui": true
     }
-
 }
 \ No newline at end of file
+// packageB/pages/AI-test-skin/analyse/analyse.js
+const app = getApp();
+const request = app.request;
+const os = app.globalData;
+const setting = os.setting;
+const ut = require('../../../../utils/util');
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        iurl: setting.imghost,
+        per:0,
+        timer:0,
+        img:null,
+        sourceimg:null,
+        err_map:null,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+       var th=this;
+       //设置错误码分析
+       this.set_err_map();
+       //进度条加载
+       this.timer();
+       //接口开始分析
+       setTimeout(function () {
+           th.analysis_img();
+       },800)
+
+    },
+    //定时器
+    timer:function (func) {
+       var per=this.data.per+5;
+       var th=this;
+       if(per<96){
+          th.setData({per:per});
+          setTimeout(function () {
+              th.timer();
+          },400)
+       }
+    },
+
+    //错误码表
+    set_err_map:function () {
+       var map={
+           "2":"服务暂不可用",
+           "4":"集群超限额",
+           "6":"没有接口权限",
+           "17":"每天流量超限额",
+           "18":"QPS超限额",
+           "19":"请求总量超限额",
+           "100":"无效的access_token参数",
+           "110":"Access Token失效",
+           "111":"	Access token过期",
+           "222001":"必要参数未传入",
+           "222002":"参数格式错误",
+           "222003":"参数格式错误",
+           "222004":"参数格式错误",
+           "222005":"参数格式错误",
+           "222006":"参数格式错误",
+           "222007":"参数格式错误",
+           "222008":"参数格式错误",
+           "222009":"参数格式错误",
+           "222010":"参数格式错误",
+           "222011":"参数格式错误",
+           "222012":"参数格式错误",
+           "222013":"参数格式错误",
+           "222014":"参数格式错误",
+           "222015":"参数格式错误",
+           "222016":"参数格式错误",
+           "222017":"参数格式错误",
+           "222018":"参数格式错误",
+           "222019":"参数格式错误",
+           "222020":"参数格式错误",
+           "222021":"参数格式错误",
+           "222022":"身份证号不符合要求，备注：中国大陆身份证号的每一位数字都有其生成规则，不可随意填写。",
+           "222023":"参数格式错误",
+           "222024":"参数格式错误",
+           "222025":"参数格式错误",
+           "222026":"参数格式错误",
+           "222027":"验证码长度错误(最小值大于最大值)",
+           "222028":"参数格式错误",
+           "222029":"参数格式错误",
+           "222030":"参数格式错误",
+           "222039":"参数格式错误",
+           "222200":"该接口需使用application/json的格式进行请求",
+           "222201":"服务端请求失败",
+           "222202":"图片中没有人脸",
+           "222203":"无法解析人脸",
+           "222204":"从图片的url下载图片失败",
+           "222205":"服务端请求失败",
+           "222206":"服务端请求失败",
+           "222207":"未找到匹配的用户",
+           "222208":"图片的数量错误",
+           "222209":"face token不存在",
+           "222210":"人脸库中用户下的人脸数目超过限制",
+           "222300":"人脸图片添加失败",
+           "222301":"获取人脸图片失败",
+           "222302":"服务端请求失败",
+           "222303":"获取人脸图片失败",
+           "222152":"人脸属性编辑，target参数错误",
+           "222514":"人脸属性编辑v2调用服务失败，请重试",
+           "223100":"操作的用户组不存在",
+           "223101":"该用户组已存在",
+           "223102":"找不到该用户",
+           "223103":"找不到该用户",
+           "223104":"group_list包含组数量过多",
+           "223105":"该人脸已存在",
+           "223106":"该人脸不存在",
+           "223107":"人脸库中人脸复制时源组与目标组的scene_type不同",
+           "223110":"uid_list包含数量过多",
+           "223111":"目标用户组不存在",
+           "223112":"quality_conf格式不正确",
+           "223113":"人脸有被遮挡",
+           "223114":"人脸模糊",
+           "223115":"人脸光照不好",
+           "223116":"人脸不完整",
+           "223117":"app_list包含app数量过多",
+           "223118":"质量控制项错误",
+           "223119":"活体控制项错误",
+           "223120":"活体检测未通过",
+           "223121":"质量检测未通过 左眼遮挡程度过高",
+           "223122":"质量检测未通过 右眼遮挡程度过高",
+           "223123":"质量检测未通过 左脸遮挡程度过高",
+           "223124":"质量检测未通过 右脸遮挡程度过高",
+           "223125":"质量检测未通过 下巴遮挡程度过高",
+           "223126":"质量检测未通过 鼻子遮挡程度过高",
+           "223127":"质量检测未通过 嘴巴遮挡程度过高",
+           "222901":"参数校验初始化失败",
+           "222902":"参数校验初始化失败",
+           "222903":"参数校验初始化失败",
+           "222904":"参数校验初始化失败",
+           "222905":"接口初始化失败",
+           "222906":"接口初始化失败",
+           "222907":"缓存处理失败",
+           "222908":"缓存处理失败",
+           "222909":"缓存处理失败",
+           "222910":"数据存储处理失败",
+           "222911":"数据存储处理失败",
+           "222912":"数据存储处理失败",
+           "222913":"接口初始化失败",
+           "222914":"接口初始化失败",
+           "222915":"后端服务连接失败",
+           "222916":"后端服务连接失败",
+           "222304":"图片尺寸太大",
+           "222305":"当前版本不支持图片存储",
+           "223128":"正在清理该用户组的数据",
+           "223136":"该组内存在关联图片，无法新建相同名称组",
+           "222361":"公安服务连接失败",
+           "222046":"参数格式错误",
+           "222101":"参数格式错误",
+           "222102":"参数格式错误",
+           "222307":"图片非法 鉴黄未通过",
+           "222308":"图片非法 含有政治敏感人物",
+           "222211":"人脸融合失败 模板图质量不合格",
+           "222212":"人脸融合失败",
+           "223129":"人脸未面向正前方（人脸的角度信息大于30度）",
+           "223130":"spoofing_control参数格式错误",
+           "223131":"合成图检测未通过",
+           "223201":"请求参数scene_type 格式错误",
+           "223202":"识别时请求的scene_type与group设置的scene_type不匹配",
+       }
+       this.setData({err_map:map});
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function (){ },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    analysis_img:function () {
+        var th=this;
+        var data={
+            "appid": "25521854",
+            "image": getApp().globalData.face_SourceImg,
+            "face_field": "color,smooth,acnespotmole,wrinkle,eyesattr,blackheadpore,skinface,skinquality",
+            "image_type": "URL"
+        }
+
+        //开始调用接口，进行分析
+        getApp().request.json_post("/api/weshop/baidubce/face/skinAnalyze",data,function (res) {
+            if(res.data.code==0){
+                wx.showToast({
+                    title: "分析成功",
+                    icon: 'success',
+                    duration: 2000
+                });
+                getApp().globalData.face_result=res.data.data;
+            }else{
+                var msg=th.data.err_map[res.data.code+""];
+                wx.showToast({
+                    title: msg,
+                    icon: 'none',
+                    duration: 2000
+                });
+            }
+        })
+    }
+
+
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<view class="content">
+    <view class="img" style="margin-left: -38rpx"></view>
+    <view style="text-align: center;margin-top: -20%;">
+        <text style="color: #fff;">正在分析...</text>
+        <progress border-radius="6" percent="{{per}}" activeColor="#fff" backgroundColor="#85898a" class="progress"></progress>
+    </view>
+</view>
+/* packageB/pages/AI-test-skin/analyse/analyse.wxss */
+page {
+    width: 100%;
+    height: 100%;
+}
+
+.content {
+    /* display: flex;
+    flex-direction: column;
+    align-items: center; */
+    background: #515658;
+    width: 100%;
+    height: 100%;
+
+}
+
+@keyframes mymove {
+    from {
+        background-position: 0, 0;
+    }
+
+    to {
+        background-position: -9450px 0;
+    }
+}
+
+.img {
+    background: url("https://mshopimg.yolipai.net//miniapp/images/skinimg/11.png");
+    margin-top: 15%;
+    display: inline-block;
+    width: 350px;
+    height: 350px;
+    transform: scale(0.55);
+    animation: 1s mymove infinite steps(27, end);
+}
+
+.progress {
+    margin-top: 3%;
+    width: 60%;
+    /* text-align: center; */
+    margin-left: 50%;
+    transform: translateX(-50%);
+}
 \ No newline at end of file
+// packageB/pages/AI-test-skin/fail_result/fail_result.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--packageB/pages/AI-test-skin/fail_result/fail_result.wxml-->
+<text>packageB/pages/AI-test-skin/fail_result/fail_result.wxml</text>
+/* packageB/pages/AI-test-skin/fail_result/fail_result.wxss */
 \ No newline at end of file
+// packageB/pages/AI-test-skin/history_record/history_record.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--packageB/pages/AI-test-skin/history_record/history_record.wxml-->
+<text>packageB/pages/AI-test-skin/history_record/history_record.wxml</text>
+/* packageB/pages/AI-test-skin/history_record/history_record.wxss */
+page {
+    width: 100vw;
+    height: 100%;
+    padding: 20rpx;
+    padding-top: 40rpx; 
+    box-sizing: border-box;
+    background-color: #e7f5fb;
+}
 \ No newline at end of file
@@ -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/3.jpeg"></image>
     <view class="start_btn" bindtap="goto" data-url="/packageB/pages/AI-test-skin/shoot_notice/shoot_notice">
         <text>开始测肤</text>
     </view>
+/*
+ * @Author: your name
+ * @Date: 2022-02-16 14:34:42
+ * @LastEditTime: 2022-02-16 15:42:25
+ * @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\select_photo\select_photo.js
+ */
+// packageB/pages/AI-test-skin/select_photo/select_photo.js
+const app = getApp();
+const request = app.request;
+const os = app.globalData;
+const setting = os.setting;
+const ut = require('../../../../utils/util');
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        iurl: setting.imghost,
+        gl_skin_img: null,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+       var img=getApp().globalData.skin_img;
+       this.setData({gl_skin_img:img})
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {},
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    },
+
+    //-- 完成选择 --
+    ok_select:function () {
+        var th=this;
+        app.request.uploadFile("/api/weshop/baidubce/face/uploadImg?uploadPath=faceimg&storeId="+setting.stoid, {
+            filePath: th.data.gl_skin_img,
+            name: "file",
+            success: function (e) {
+                if(e.data.code==0) {
+                    getApp().globalData.face_img=e.data.data.img;
+                    getApp().globalData.face_SourceImg=e.data.data.SourceImg;
+
+                    let url = "/packageB/pages/AI-test-skin/analyse/analyse"; //跳到分析页
+                    app.goto(url);
+
+                } else {
+                    wx.showToast({
+                        title: e.data.msg,
+                        icon: 'success',
+                        duration: 2000
+                    });
+                };
+            }
+        });
+    },
+
+    //-- 重新从相册中选择图片 --
+    show_pai_pop:function () {
+        var th=this;
+        //选择和拍照一张图片
+        wx.chooseImage({
+            count: 1,
+            sizeType: ['original', 'compressed'],
+            sourceType: ['album', 'camera'],
+            success (res) {
+                let imgArr = res.tempFilePaths;
+                getApp().globalData.skin_img=imgArr[0];
+                th.setData({gl_skin_img:imgArr[0]})
+            }
+        })
+
+    },
+
+
+
+
+})
 \ No newline at end of file
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "确认图片"
+}
 \ No newline at end of file
+<view class="content" style="height: 70%;">
+    <view style="height: 100%;">
+        <image style="height: 100%;width: 100%;border-radius: 3%;" src="{{gl_skin_img}}"></image>
+    </view>
+    <view class="foot_btn">
+        <view class="reset_select" bindtap="show_pai_pop">
+            <text class="iconfont icon-zuojiantou" style="font-size: 40rpx"></text>
+            <text style="font-size: 28rpx">重拍</text>
+        </view>
+        <view class="ok_btn" bindtap="ok_select">
+            <text class="iconfont icon-dagou" style="margin-right: 10rpx"></text>
+            <text>完成</text>
+        </view>
+    </view>
+</view>
+/* packageB/pages/AI-test-skin/select_photo/select_photo.wxss */
+page {
+    width: 100%;
+    height: 100%;
+}
+
+.content {
+    padding: 10%;
+    height: 60%;
+}
+
+.foot_btn {
+    margin-top: 80rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.foot_btn .reset_select {
+    display: flex;
+    flex-direction: column;
+}
+
+.foot_btn .ok_btn {
+    background: #5dd9dc;
+    padding: 0 50rpx;
+    border-radius: 50rpx;
+    /* margin: 0 auto; */
+    line-height: 100rpx;
+    color: #fff;
+}
+/*
+ * @Author: your name
+ * @Date: 2022-02-15 10:01:57
+ * @LastEditTime: 2022-02-16 15:40:54
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AEet urkl
+ * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\shoot_notice\shoot_notice.js
+ */
 // packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js
 const app = getApp();
 const request = app.request;
@@ -21,13 +29,6 @@ Page({
     },
     /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
@@ -42,13 +43,6 @@ Page({
     },
     /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
      * 页面相关事件处理函数--监听用户下拉动作
      */
     onPullDownRefresh: function () {
@@ -67,5 +61,26 @@ Page({
      */
     onShareAppMessage: function () {
-    }
+    },
+
+    //从相册中选择图片
+    show_pai_pop:function () {
+        //选择和拍照一张图片
+        wx.chooseImage({
+            count: 1,
+            sizeType: ['original', 'compressed'],
+            sourceType: ['album', 'camera'],
+            success (res) {
+                let imgArr = res.tempFilePaths;
+                getApp().globalData.skin_img=imgArr[0];
+                let url = "/packageB/pages/AI-test-skin/select_photo/select_photo";
+                app.goto(url);
+            }
+        })
+
+    },
+
+
+
+
 })
 \ No newline at end of file
@@ -51,9 +51,7 @@
 </view>
 <view style="height: 300rpx;background-color: #e7f5fb;">
     <view class="btn_fixed">
-        <view class="btn">
-            准备闭眼拍摄
-        </view>
+        <view class="btn" bindtap="show_pai_pop">准备闭眼拍摄</view>
         <view class="notice" style="display:flex;justify-content:center;align-items: center;">
             <text class="iconfont icon-info" style="margin-right: 10rpx;font-size: 26rpx"></text>
             <text>如无闭眼，将导致图片分析失败</text>
@@ -2,11 +2,11 @@
 page {
     width: 100vw;
     height: 100%;
-    padding: 40rpx 30rpx 0 30rpx;
+    /*padding: 40rpx 30rpx 0 30rpx;*/
     box-sizing: border-box;
     background-color: #e7f5fb;
 }
-
+.page_set{padding: 40rpx 30rpx 0 30rpx;}
 .content {
     width: 100%;
     /* height: 100%; */
@@ -90,4 +90,45 @@ page {
     text-align: center;
     color: red;
     font-size: 28rpx;
-}
 \ No newline at end of file
+}
+
+.cover-layer {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 11;
+    background: rgba(0,0,0,0.4);
+    width: 100%;
+    height: 100%;
+}
+
+.flex{display: flex}
+.jc-center{
+    justify-content: center;
+}
+.ac{align-items: center}
+.pai_content{
+    position: fixed;z-index: 100;bottom: 0;background: #FFFFFF;width: 100%;
+    border-top-left-radius:30rpx;
+    border-top-right-radius:30rpx;
+}
+.p_item{ height: 100rpx; line-height: 100rpx;text-align: center; border-bottom: 1rpx solid #eee}
+.p_cancle{height: 100rpx; line-height: 100rpx;text-align: center; border-top:20rpx solid #f8f8f8;}
+
+@keyframes p_up
+{
+    from {transform:translateY(100%);}
+    to {transform:translateY(0);}
+}
+
+@keyframes p_down
+{
+   from {transform:translateY(0);}
+   to {transform:translateY(100%);}
+}
+.p_to_up{animation:p_up 1s;}
+.p_to_down{animation:p_down 0.5s;}
+
+
+// packageB/pages/AI-test-skin/success_result/success_result.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--packageB/pages/AI-test-skin/success_result/success_result.wxml-->
+<text>packageB/pages/AI-test-skin/success_result/success_result.wxml</text>
+/* packageB/pages/AI-test-skin/success_result/success_result.wxss */
 \ No newline at end of file
@@ -60,7 +60,7 @@ Page({
   onLoad: function(options) {	  
     var th=this;
 	//-- 读取会员中心按钮列表 --
-	getApp().request.get("/api/weshop/userTool/page?pageSize=100", {
+	getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, {
 		success:function(res){
 			if(ut.ajax_ok(res)) {
 			     var d_list=res.data.data.pageData;