Merge branch 'master' of http://124.225.116.118:35236/changchaofan/best_AI

pages/cameraTakePhoto/cameraTakePhoto.js

@@ -61,16 +61,16 @@ Page({
     small_finish: false,
     // status_zhi:''
   },
-  onLoad: function () {
+  onLoad: function (options) {
+    const param = options.param;
+    console.log('param1',param)
+    wx.setStorage({
+      key: 'param',
+      data: param
+    })
     var that = this
     this.Sounds();
-    // const status_zhi = (wx.getStorageSync('status_zhi') || '')
-    // this.setData({
-    //   status_zhi
-    // })
-    // console.log('status_zhi',status_zhi)
     const dongtaishuju_chuan = wx.getStorageSync('dongtaishuju')
-    // console.log('dongtaishuju_chuan', dongtaishuju_chuan)
     switch (dongtaishuju_chuan) {
       case 1:
         this.Countone_Time();
@@ -94,7 +94,8 @@ Page({
       const labelCode = labelInfo.cpid_jm || labelInfo.cpid
       this.setData({
         labelCode,
-        dongtaishuju_chuan
+        dongtaishuju_chuan,
+        param,
       })
       // console.log('labelCode', labelCode)
     }
@@ -764,7 +765,7 @@ Page({
           // console.log('setZoom成功', res);
           const takephoto2_state = res.errMsg;
           this.setData({
-            takephoto2_state
+            takephoto2_state,
           });
           // console.log('takephoto2_state', takephoto2_state);
           setTimeout(() => {
@@ -780,20 +781,13 @@ Page({
                   key: 'originalImagePath',
                   data: res.tempImagePath,
                 });
-                // console.log('image', res.tempImagePath);
                 this.setData({
                   bigfileimage: res.tempImagePath,
-                  result_zoom: this.data.result_zoom
                 });
-                // const file = res.tempImagePath;
-                // const base = wx.getFileSystemManager().readFileSync(file, 'base64');
-                // console.log('file', file);
-                // console.log('base', base);
+             
                 wx.navigateTo({
                   url: '../upload/upload?path=' + that.data.bigfileimage + '&char=0'
                 });
-                // console.log('传值成功');
-                // console.log('res.tempImagePath', that.data.bigfileimage);
               },
               fail: err => {
                 console.error('拍照失败', err);
@@ -831,7 +825,7 @@ Page({
       let  phone_list= ['NOH-AN00','NOH-AN01','OCE-AN10','JAD-AL00','LNA-AL00','NOP-AN00','NOH-AL10','ABR-AL80','MNA-AL00','JAD-AL50','ABR-AL00','ABR-AL90','ABR-AL60','ABR-AL60','NOH-AN50']
       if(phone_list.includes(phone_model)){
         // console.log('特殊手机型号')
-        timeS = 750
+        timeS = 850
       }
       else if (benchmarkLevel > 40) {
         timeS = 350;

pages/fenggu/AICheck/AICheck.js

 // pages/fenggu/AICheck/AICheck.js
 Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    showMask:true
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
+  takePhoto: function (e) {
+    const values = 'fenggu'
+    wx.navigateTo({
+      // url: '../takePhoto/takePhoto'
+      url: '/pages/cameraTakePhoto/cameraTakePhoto?param=' + values
+    })
   },
-
   // 关闭遮罩层
   closeMask() {
     this.setData({
-      showMask:false
+      showMask: false
     })
   },
 
   // 联系客服
-  handleServe(){
+  handleServe() {
     console.log(999)
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
   }
-})
+})
\ No newline at end of file

pages/fenggu/AICheck/AICheck.wxml

@@ -3,12 +3,10 @@
     <view class="content-box">
         <image src="/assets/fenggu/logo.png" mode="widthFix" class="logo-img" />
 
-        <image src="/assets/fenggu/AI.png" mode="widthFix" class="ai-img" />
-        <image src="/assets/fenggu/开始认证.png" mode="widthFix" style="width: 400rpx;" />
+        <image src="/assets/fenggu/AI.png" mode="widthFix" class="ai-img"/>
+        <image src="/assets/fenggu/开始认证.png" bindtap="takePhoto"  mode="widthFix" style="width: 400rpx;"/>
     </view>
-
-    <!-- 验证不同遮罩层 -->
-    <view wx:if="{{showMask}}" class="mask">
+     <view wx:if="{{showMask}}" class="mask">
         <!-- 未通过 -->
         <view class="fali mask-card" wx:if="{{false}}">
             <image src="/assets/fenggu/未通过卡片.png" mode="widthFix" />

pages/upload/upload.js

@@ -90,6 +90,8 @@ Page({
     this.onHide();
     const openid = wx.getStorageSync('openid')
     const extraData = wx.getStorageSync('extraData')
+    const param = wx.getStorageSync('param')
+    console.log('param',param)
     let labelInfo = extraData
     console.log('labelInfo', labelInfo)
     var userid = labelInfo.uid
@@ -98,7 +100,8 @@ Page({
     // console.log('cpid', cpid)
     this.setData({
       userid,
-      cpid
+      cpid,
+      param
     })
     if (labelInfo === '') {
       console.log('id为空')
@@ -316,31 +319,34 @@ Page({
   uploadImg() {
     console.log('this.data.filePath', this.data.filePath)
     const base = wx.getFileSystemManager().readFileSync(this.data.filePath, 'base64')
+
+    //增加不需要进行码判断
+    this.checkAiResult(base);
     // console.log('base', base)
-    if (this.data.labelCode) {
-      // console.log('开始检查标签相似')
-      this.checkIsSameCode(base, (state) => {
-        this.setData({
-          sameCodeState: state
-        })
-        if (state === 1) {
-          this.checkAiResult(base);
-        } else {
-          this.setData({
-            isLoading: false,
-          })
-        }
-      })
-      console.log("sameCodeState", this.data.sameCodeState)
-    } else {
-      console.log('进入不需要检查标签相似')
-      this.setData({
-        sameCodeState: 1,
-        userimage: false,
-        userinfo_name: false
-      })
-      this.checkAiResult(base);
-    }
+    // if (this.data.labelCode) {
+    //   // console.log('开始检查标签相似')
+    //   this.checkIsSameCode(base, (state) => {
+    //     this.setData({
+    //       sameCodeState: state
+    //     })
+    //     if (state === 1) {
+    //       this.checkAiResult(base);
+    //     } else {
+    //       this.setData({
+    //         isLoading: false,
+    //       })
+    //     }
+    //   })
+    //   console.log("sameCodeState", this.data.sameCodeState)
+    // } else {
+    //   console.log('进入不需要检查标签相似')
+    //   this.setData({
+    //     sameCodeState: 1,
+    //     userimage: false,
+    //     userinfo_name: false
+    //   })
+    //   this.checkAiResult(base);
+    // }
   },
   //检查标签是否相同
   checkIsSameCode(base, cb) {
@@ -1021,7 +1027,7 @@ Page({
                                 isLoading: false,
                                 sameCodeState: 1
                               })
-                              // console.log('this.data.peo_state', this.data.peo_state)
+                              // console.log('this.data.peo_state', this.data.peo_state)1
                               // console.log('this.data.fail_state', this.data.fail_state)
                               // console.log('this.data.sameCodeState', this.data.sameCodeState)
                               clearInterval(this.data.setInter)
@@ -1367,11 +1373,6 @@ Page({
       return;
     }
     labelInfo.state = state
-    // console.log('state', state)
-    // console.log('labelInfo.state', labelInfo.state)
-    // const uuid = labelInfo.uuid
-    // console.log('uuid', uuid)
-    // console.log('labelInfo.os',labelInfo.os)
     //调用云平台接口 
     if (labelInfo.os === 'davis') {
       wx.request({
@@ -1398,9 +1399,7 @@ Page({
         },
         success: (res) => {
           console.log('回调成功')
-          // console.log('labelInfo.success', labelInfo.success);
-          // console.log('this.data.notice')
-        }
+w        }
       })
     }
   },

project.private.config.json

@@ -48,6 +48,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/fenggu/AICheck/AICheck",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }