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

pages/cameraTakePhoto/cameraTakePhoto.js

@@ -551,7 +551,8 @@ Page({
               this.setData({
                 kongfileimage: res.tempImagePath
               })
-              // console.log('开始解析')
+              console.log('开始解析')
+              // console.log('this.data.labelcode',this.data.labelCode)
               //解码API
               wx.request({
                 // url:'https://ai.china315net.com:35437/api/upload/',
@@ -562,7 +563,7 @@ Page({
                 method: 'POST',
                 data: {
                   base,
-                  'labelCodejson': this.data.labelCode
+                  'labelCodejson': '123456789123'
                 },
                 success: (res) => {
                   // console.log('base', base)
@@ -607,7 +608,7 @@ Page({
                       data: points
                     })
                     var datajson = res_data.codeinfo;
-                    // console.log('原图解析内容datajson', datajson)
+                    console.log('原图解析内容datajson', datajson)
                     wx.setStorage({
                       key: 'datajson',
                       data: datajson
@@ -619,7 +620,7 @@ Page({
                   if (res.errMsg.indexOf('timeout') !== -1) {
                     // console.log('请求超时')
                     const datajson = '码解析失败'
-                    // console.log('datajson1',datajson)
+                    console.log('datajson1',datajson)
                     wx.setStorage({
                       key: 'datajson',
                       data: datajson
@@ -630,7 +631,7 @@ Page({
                   if (!res.data) {
                     // console.log('网络请求没有返回任何数据')
                     const datajson = '码解析失败'
-                    // console.log('datajson1',datajson)
+                    console.log('datajson1',datajson)
                     wx.setStorage({
                       key: 'datajson',
                       data: datajson
@@ -650,6 +651,7 @@ Page({
                 },
                 success: (res) => {
                   let result_value = res.data.result
+                  console.log('result_value',result_value)
                   let yuan_file = res.data.image_path
                   // console.log('yuan_file', yuan_file)
                   wx.setStorage({
@@ -668,7 +670,8 @@ Page({
                     })
                     // console.log('hint_phone', hint_phone)
                   } else {
-                    // console.log('不等于14分类')
+                    console.log('不等于14分类')
+                    console.log('result_value',result_value)
                     let hint_phone = result_value
                     wx.setStorage({
                       key: 'hint_phone',

pages/result/result.wxml

@@ -2,7 +2,7 @@
     <!-- 页面背景 -->
     <image  class="bg-img" src="/assets/imgs/结果页背景{{bg_color}}.jpg" mode='scaleToFill'></image>
     <!-- 验证通过页面 -->
-    <view wx:if="{{!aiState == 1}}" class="success-content full">
+    <view wx:if="{{aiState == 1}}" class="success-content full">
         <view class="content-text">
             <image src="/assets/imgs/成功.png" mode="widthFix" style="width: 40%;" />
             <view class="query-text">
@@ -10,7 +10,8 @@
                 <text>本次认证耗时：{{time2}}</text>
             </view>
             <image src="/assets/imgs/通过.png" mode="widthFix" style="width: 50%;" />
-            <view class="btn" bind:tap="handleBack">返回主页面</view>
+            <!-- <view class="btn" bind:tap="handleBack">返回主页面</view> -->
+            <navigator class="btn" open-type="exit" target="miniProgram">点击按钮返回主页</navigator>
         </view>
         <image src="/assets/imgs/验证成功底部.png" mode="widthFix" style="width: 100%;" />
     </view>

pages/upload/upload.js

@@ -265,7 +265,7 @@ Page({
     const points_chuan = wx.getStorageSync('points')
     const hint_phone = wx.getStorageSync('hint_phone')
     wx.removeStorageSync('hint_phone')
-    // console.log('hint_phone', hint_phone)
+    console.log('hint_phone', hint_phone)
     const yuan_file = wx.getStorageSync('yuan_file')
     wx.removeStorageSync('yuan_file')
     // console.log('yuan_file', yuan_file)
@@ -413,9 +413,9 @@ Page({
         } else if (this.data.recognizeLabelCode === '码解析失败' && this.data.datajson === '码解析失败') {
           console.log('解析失败')
           cb(2);
-          this.setData({
-            aiState: 3
-          })
+          // this.setData({
+          //   aiState: 3
+          // })
           const dtime1 = util.formatTime(new Date());
           wx.request({
             url: 'https://ai.tj5.cc:35437/api/all/',
@@ -931,6 +931,7 @@ Page({
           key: 'notice',
           data: notice
         })
+        console.log('notice调用人工服务',notice)
         if (notice != '手机边框') {
           if (aiState !== 1) {
             Count++;
@@ -1190,6 +1191,7 @@ Page({
           'zoom_number': this.data.zoom_number || ''
         }
         console.log('this.data.image_file_myapi', )
+        console.log('aistate',aiState)
 
         wx.request({
           // url: 'https://ai.china315net.com:35437/api/all/',
@@ -1419,7 +1421,6 @@ Page({
         },
         success: (res) => {
           console.log('回调成功')
-          w
         }
       })
     }

pages/upload/upload.wxml

@@ -22,9 +22,9 @@
       <block wx:if="{{aiState === 2}}">
         <image class="msg-img" src="/assets/imgs/fail/slur.png" bindtap="back"></image>
       </block>
-      <block wx:if="{{aiState === 3}}">
+      <!-- <block wx:if="{{aiState === 3}}">
         <image class="msg-img" src="/assets/imgs/fail/incomplete.png" bindtap="back"></image>
-      </block>
+      </block> -->
       <view class="text_text" style="color: aliceblue;"><text>点击拍照按钮重新认证</text></view>
       <navigator class="bexit" open-type="exit" target="miniProgram">点击按钮返回主页</navigator>
     </block>

pages/video/video.js

@@ -5,8 +5,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    bg_color:'',
-    src:'http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
+    bg_color: '',
+    src: 'https://ai.tj5.cc:35437/static/video/TJai.mp4'
   },
 
   /**
@@ -14,7 +14,17 @@ Page({
    */
   onLoad(options) {
     this.setData({
-      bg_color:getApp().page_bg
+      bg_color: getApp().page_bg
+    })
+  },
+  handleOpenVideo() {
+    wx.reLaunch({
+      url: '../cameraTakePhoto/cameraTakePhoto',
+    })
+  },
+  back() {
+    wx.reLaunch({
+      url: '/pages/index/index',
     })
     this.getVideoUrl()
   },

pages/video/video.wxml

@@ -4,8 +4,8 @@
     <!-- 验证通过页面 -->
     <video src="{{src}}" style="width: 100%;" autoplay controls danmu-btn show-center-play-btn object-fit="fill" />
     <view class="text-content">
-        <view class="btn" style="background-color: #074AC5;color: #fff;">学会了，立即去验证</view>
-        <view class="btn">返回</view>
+        <view class="btn" style="background-color: #074AC5;color: #fff;" bindtap="handleOpenVideo" >学会了，立即去验证</view>
+        <view class="btn" bindtap="back">返回</view>
         <image src="/assets/imgs/视频页说明{{bg_color}}.png" mode='widthFix' style="margin-top: 50rpx;width: 80%;" />
     </view>
 </view>
\ No newline at end of file

project.private.config.json

@@ -4,7 +4,7 @@
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": false
   },
   "condition": {
     "miniprogram": {