Save yarn.lock changes before merge

src/pages/shouye/model.ts

@@ -13,7 +13,7 @@ export class shouye extends VuexModule {
   checkversion: any = {};
   @MutationAction
   async checkupdate() {
-    const result: any = await http.post('/prod-api/system/apkFile/getLastApkVersion', {
+    const result: any = await http.post('/dev-api/system/apkFile/getLastApkVersion', {
       factory: 1000,
     });
     const checkversion: any = result.data;

src/pages/wms/Raw/ArrivalRegistration/index.vue

@@ -83,6 +83,10 @@
             <view class="pouptitle">登记数量：</view>
             <u-input class="poupcontent" :clearable="false" v-model="czNumber" placeholder="" style="overflow: hidden" />
           </view>
+          <!--          <view class="poupitem">-->
+          <!--            <view class="pouptitle">托盘号：</view>-->
+          <!--            <u-input class="poupcontent" :clearable="false" v-model="rfidCode" placeholder="" style="overflow: hidden" />-->
+          <!--          </view>-->
           <view class="poupbutton" style="margin-top: 10px">
             <div>
               <u-button style="width: 100px; height: 35px" @click="onOksing" size="mini" type="primary">确定</u-button>
@@ -120,6 +124,7 @@ export default class ArrivalRegistration extends BasePage {
   operationNumber = 0;
   nooperationNumber = 0;
   czNumber = '';
+  rfidCode = '';
   whList: any = [];
   waCodeList: any = [];
   show = false;
@@ -190,6 +195,7 @@ export default class ArrivalRegistration extends BasePage {
     this.operationNumber = 0;
     this.nooperationNumber = 0;
     this.czNumber = '';
+    this.rfidCode = '';
   }
   // async onFormDoubleClick(item) {
   //   console.log('双击', item);
@@ -407,6 +413,7 @@ export default class ArrivalRegistration extends BasePage {
       procureCode: this.prodobj.value,
       id: this.list[0].id,
       czNumber: this.czNumber,
+      rfidCode: this.rfidCode,
       lastUpdateBy: session.loginName,
     };
     //console.log('99999',params);

vue.config.js

@@ -4,18 +4,16 @@ module.exports = {
       '/prod-api': {
         //正式生产
         target: 'http://192.168.202.34:30000',
-        //测试生产
-        //target: 'http://192.168.202.20:9000',
         changeOrigin: true,
-        // pathRewrite: {
+        pathRewrite: {
-        //   '^/prod-ap': '',
+          '^/prod-api': '',
-        // },
+        },
       },
       '/dev-api': {
         //target: 'http://192.168.3.63:8080',
         // target: 'http://192.168.3.66:8080',
-        target: 'http://192.168.3.231:8080', //贵迎
+        // target: 'http://172.18.80.120:8080', //贵迎
-        //target: 'http://192.168.3.158:8080',
+        target: 'http://192.168.0.10:8080',
         changeOrigin: true,
         pathRewrite: {
           '^/dev-api': '',