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

后端研发-苏泰源
2 parents fe1e01f5 79faacb5
Showing 2 changed files with 3 additions and 7 deletions
packageB/pages/AI-test-skin/analyse/analyse.js
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss
@@ -215,11 +215,8 @@ Page({
                 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
-                });
+                let url = "/packageB/pages/AI-test-skin/fail_result/fail_result?msg="+msg; //跳到分析页
+                app.goto(url);
             }
         })
     }
@@ -2,11 +2,10 @@
 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%; */