ycm 2 years ago
parent
commit
206b688659

+ 5 - 2
pages/control/result/result.js

@@ -18,9 +18,12 @@ Page({
         });
         });
     },
     },
     tourl(){
     tourl(){
-        wx.navigateTo({
-          url: '/pages/control/choice/choice',
+        wx.navigateBack({
+          delta: 2,
         })
         })
+        // wx.navigateTo({
+        //   url: '/pages/control/choice/choice',
+        // })
     }
     }
 
 
 
 

+ 1 - 1
pages/record/recorddetailsinfo/recorddetailsinfo.js

@@ -29,7 +29,7 @@ Page({
     },
     },
     onClick(){
     onClick(){
         wx.navigateBack({
         wx.navigateBack({
-            delta: 1 //想要返回的层级
+            delta: 2 //想要返回的层级
           })
           })
     },
     },
     /**
     /**

+ 3 - 3
pages/record/recorddetailsinfo/recorddetailsinfo.wxml

@@ -24,9 +24,9 @@
         </view>
         </view>
     </view>
     </view>
     <view>
     <view>
-        <view wx:for="{{info.logistic}}" wx:key="index">
-            <view>物流单号:{{item.username}}</view>
-            <view>目的地:{{item.title}}</view>
+        <view>
+            <view>物流单号:{{info.logistic.seal_no}}</view>
+            <view>目的地:{{info.logistic.title}}</view>
         </view>
         </view>
         <view wx:if="{{info.logistic.length<=0}}">暂无信息</view>
         <view wx:if="{{info.logistic.length<=0}}">暂无信息</view>
     </view>
     </view>

+ 4 - 2
pages/sorting/add/add.js

@@ -42,6 +42,9 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) {
   onLoad: function (options) {
+    // if(options.seal_no){
+      
+    // }
     this.data.tagnum = options.seal_no
     this.data.tagnum = options.seal_no
     var type= options.type
     var type= options.type
     this.data.fenid = options.fenid?options.fenid:0
     this.data.fenid = options.fenid?options.fenid:0
@@ -85,12 +88,11 @@ getdata(){
         console.log(data.images[i])
         console.log(data.images[i])
       fileList.push({url: data.images[i]});
       fileList.push({url: data.images[i]});
     }
     }
-    
       that.setData({
       that.setData({
         inputval:data.wash_code,
         inputval:data.wash_code,
         title:data.cat_title,
         title:data.cat_title,
         ispick:data.color,
         ispick:data.color,
-        rustr:data.flaw[0].name,
+        rustr:data.flaw.length>0?data.flaw[0].name:'',
         results:data.standard_id,
         results:data.standard_id,
         isworkstr:data.is_machining,
         isworkstr:data.is_machining,
         fileList,
         fileList,

+ 6 - 3
pages/tabber/builds/hand_desc/handDesc.js

@@ -118,6 +118,9 @@ Page({
       })
       })
     }
     }
 
 
+    if(this.data.show){
+      this.setData({inpuval:''})
+    }
 
 
   },
   },
   isshow() {
   isshow() {
@@ -170,12 +173,12 @@ Page({
         wx.showLoading({
         wx.showLoading({
           title: res.message.msg,
           title: res.message.msg,
         })
         })
-        setTimeout(function () {
+        setTimeout(()=>{
           wx.hideLoading();
           wx.hideLoading();
           wx.navigateTo({
           wx.navigateTo({
-            url: '/pages/record/recorddetailsinfo/recorddetailsinfo?si=1&id='+data.id,
+            url: '/pages/record/recorddetailsinfo/recorddetailsinfo?si=1&id='+data.id.id,
           })
           })
-        }, 1000);
+        },1000)
  
  
         
         
 
 

+ 7 - 0
pages/tabber/builds/index.js

@@ -22,6 +22,12 @@ Page({
     onLoad(){
     onLoad(){
        this.getdata();
        this.getdata();
     },
     },
+    onShow(){
+      this.getdata();
+    },
+    onPullDownRefresh(){
+      this.getdata();
+    },
     getScancode: function () {
     getScancode: function () {
         var _this = this;
         var _this = this;
         // 允许从相机和相册扫码
         // 允许从相机和相册扫码
@@ -51,6 +57,7 @@ Page({
             
             
         }, "get").then(function (res) {
         }, "get").then(function (res) {
           console.log(res);
           console.log(res);
+          wx.stopPullDownRefresh()
           if (res.code != 200) {
           if (res.code != 200) {
             wx.showLoading({
             wx.showLoading({
               title: res.message.msg,
               title: res.message.msg,

+ 2 - 1
pages/tabber/builds/index.json

@@ -1,4 +1,5 @@
 {
 {
   "usingComponents": {},
   "usingComponents": {},
-  "navigationBarTitleText": "打包"
+  "navigationBarTitleText": "打包",
+  "enablePullDownRefresh": true
 }
 }

+ 1 - 1
project.config.json

@@ -54,7 +54,7 @@
     },
     },
     "compileType": "miniprogram",
     "compileType": "miniprogram",
     "libVersion": "2.22.0",
     "libVersion": "2.22.0",
-    "appid": "wx3474318f187cd0f2",
+    "appid": "wx0b37183822da9c21",
     "projectname": "%E6%B5%B7%E6%98%9F%E7%94%A8%E6%88%B7%E7%AB%AF",
     "projectname": "%E6%B5%B7%E6%98%9F%E7%94%A8%E6%88%B7%E7%AB%AF",
     "cloudfunctionRoot": "cloudfunction/",
     "cloudfunctionRoot": "cloudfunction/",
     "cloudfunctionTemplateRoot": "cloudfunctionTemplate",
     "cloudfunctionTemplateRoot": "cloudfunctionTemplate",