最新提交的代码

app.js

@@ -4,7 +4,7 @@ App({
     global: 1,
     userLocationAuth: false,
     cameraAuth: false,
-    extraData:null
+    extraData: null
   },
   onLaunch() {
     // 展示本地存储能力
@@ -32,25 +32,40 @@ App({
 
   onShow(options) {
     // wx.clearStorageSync(); // 清空本地缓存数据
-    // console.log('options', options)
+    console.log('options', options)
+    wx.setStorageSync('extraData', JSON.stringify({}))
+    wx.setStorageSync('fenggu', '')
+
+    // options.referrerInfo.extraData =  {
+    //     "uid": "\"gAAAAABl3YfhldYhFyvH_EHb-_CPvbWIffRsxPwS1d_4lC_CxCq-CiLQtqGPEbLmXR--ZPjcIYp5mttnRTpppD6DghuymUheuw==\"",
+    //     "uuid": "F1C0DF8F",
+    //     "os": "davis",
+    //     "cpid": "EH013527418551201",
+    //     "company": "fenggu"
+    //   }
+
     if (options.referrerInfo.extraData) {
       console.log('进来了')
       let extraData = options.referrerInfo.extraData;
       console.log('extraData', extraData)
-      if (typeof (extraData) === 'string') {
-        extraData = JSON.parse(options.referrerInfo.extraData)
-      }
+    
       // console.log('到这里extraData',extraData)
-      wx.setStorage({
-        key: 'extraData',
-        data: extraData,
-      })
+      wx.setStorageSync('extraData', JSON.stringify(options.referrerInfo.extraData))
+    wx.getStorageSync('fenggu', options?.referrerInfo?.extraData?.company || '')
+
       // 启动摄像头预览
       // this.ctx.startPreview();
       // console.log('labelInfoUrl.success', labelInfoUrl.success)
-    }else{
-      console.log('options.referrerInfo.extraData',options.referrerInfo.extraData)
-      console.log('options.extraData',options.extraData)
+      // {
+      //   "uid": "\"gAAAAABl3YfhldYhFyvH_EHb-_CPvbWIffRsxPwS1d_4lC_CxCq-CiLQtqGPEbLmXR--ZPjcIYp5mttnRTpppD6DghuymUheuw==\"",
+      //   "uuid": "F1C0DF8F",
+      //   "os": "davis",
+      //   "cpid": "EH013527418551201",
+      //   "company": "fenggu"
+      // }
+    } else {
+      console.log('options.referrerInfo.extraData', options.referrerInfo.extraData)
+      console.log('options.extraData', options.extraData)
       console.log('没有获取到数据')
       wx.setStorage({
         key: 'extraData',

app.json

 {
   "pages": [
+    "pages/entryPage/entryPage",
     "pages/index/index",
     "pages/attention/attention",
     "pages/cameraTakePhoto/cameraTakePhoto",

pages/cameraTakePhoto/cameraTakePhoto.js

@@ -88,7 +88,8 @@ Page({
         })
     }
     var nCounter = 0
-    const labelInfo = wx.getStorageSync('extraData')
+    const labelInfo = JSON.parse(wx.getStorageSync('extraData'))
+    
     // console.log('labelInfo', labelInfo)
     if (labelInfo) {
       const labelCode = labelInfo.cpid_jm || labelInfo.cpid

pages/entryPage/entryPage.js

+// pages/entryPage/entryPage.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad() {
+    let myOption = wx.getStorageSync('extraData') && JSON.parse(wx.getStorageSync('extraData'))
+    if(wx.getStorageSync('fenggu') == "fenggu"){
+      console.log('丰谷页面')
+      wx.reLaunch({
+        url:'/pages/fenggu/AICheck/AICheck'
+      })
+    } else {
+      wx.reLaunch({
+        url:'/pages/index/index'
+      })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file

pages/entryPage/entryPage.json

+{
+  "usingComponents": {}
+}
\ No newline at end of file

pages/entryPage/entryPage.wxss

+/* pages/entryPage/entryPage.wxss */
\ No newline at end of file

pages/fenggu/AICheck/AICheck.js

@@ -8,7 +8,7 @@ Page({
     const values = 'fenggu'
     wx.navigateTo({
       // url: '../takePhoto/takePhoto'
-      url: '/pages/fenggu/takephoto/takephoto?param=' + values
+      url: '/pages/fenggu/takephoto/takephoto'
     })
   },
   // 关闭遮罩层

pages/index/index.js

@@ -27,8 +27,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-  console.log(options,8888)
-  console.log(options.company,'999999')
+
     // 使用正则表达式来匹配数字和字母
     var reg = /^[0-9a-zA-Z]+$/;
     var fenggu = /^http:\/\/q.fg9.vip\/m\/q\/[0-9a-zA-Z]+$/;
@@ -46,7 +45,7 @@ Page({
         url:`/pages/anti/anti?cpid=${options.cpid}`
       })
     }
-    else if(options.company == "fenggu"){
+    else if(JSON.parse(wx.getStorageSync('extraData')).company == "fenggu"){
       console.log('丰谷页面')
       wx.navigateTo({
         url:'/pages/fenggu/AICheck/AICheck'
@@ -87,7 +86,7 @@ Page({
    * 生命周期函数--监听被展示时调用
    */
   onShow: function (options) {
-    const extraData = wx.getStorageSync('extraData')
+    const extraData = JSON.parse(wx.getStorageSync('extraData'))
     // this.setData('extraData',extraData)
     // console.log('extraData', extraData)
     // console.log('extraData.success', extraData.success)

pages/upload/upload.js

@@ -89,9 +89,9 @@ Page({
   onLoad: function (options) {
     this.onHide();
     const openid = wx.getStorageSync('openid')
-    const extraData = wx.getStorageSync('extraData')
-    const param = wx.getStorageSync('param')
-    console.log('param',param)
+    const extraData = JSON.parse(wx.getStorageSync('extraData'))
+    const param = wx.getStorageSync('fenggu')
+    console.log(78787878,param)
     let labelInfo = extraData
     console.log('labelInfo', labelInfo)
     var userid = labelInfo.uid
@@ -904,7 +904,7 @@ Page({
         } else {
           notice = '算法不确定具体分类'
         }
-        if(this.data.param ==='fenggu'){
+        if(wx.getStorageSync('fenggu') ==='fenggu'){
           if (aiState === 1 ) {
             wx.redirectTo({
               url:`/pages/fenggu/success/success?time1${this.data.dtime || this.data.people_time}&time2=${this.data.people_replytime/1000 || this.data.datemill/1000}`