Merge branch 'M_2.5_1122' into test

# Conflicts:
#	src/views/entry/fillMainInf.vue

src/views/entry/fillMainInf.vue

@@ -183,6 +183,12 @@
         </el-form>
       </div>
     </el-card>
+    <!-- 图片识别 对话框 -->
+    <el-dialog title="提示" :visible.sync="isReadFailVisible" width="400px" center
+               :close-on-click-modal="false">
+      <p>未能识别有效信息，请重新上传正确的图片或者手动输入相关信息</p>
+      <p>改弹窗显示<span>readTime</span>s后自动关闭，无需手动关闭</p>
+    </el-dialog>
   </div>
 </template>
 
@@ -226,14 +232,14 @@
         }
       };
       let licenseTimeValidator = (rule, value, callback) => {
-        if (this.periodConcreteTime == [] && this.periodLongTermVal === false) {
+        if ( (this.periodConcreteTime.length == 0 || !this.periodConcreteTime) && this.periodLongTermVal === false) {
           callback(new Error("营业期限具体时间和长期必须填写其中一个"));
         } else {
           callback();
         }
       };
       let idCardTimeValidator = (rule, value, callback) => {
-        if (this.validityConcreteTime === null && this.validityLongTermVal === false) {
+        if ((this.validityConcreteTime.length == 0 || !this.validityConcreteTime) && this.validityLongTermVal === false) {
           callback(new Error("有效期具体时间和长期必须填写其中一个"));
         } else {
           callback();
@@ -289,7 +295,10 @@
           idcard_front: [{required: true, message: '请上传法人证件电子版图片',validator: idCardValidator}],
           license_expires_time: [{ validator:licenseTimeValidator,required: true,trigger: 'change' }],
           idcard_expires_time: [{ validator:idCardTimeValidator,required: true,trigger: 'change' }]
-        }
+        },
+        readTime: 5,
+        isReadFailVisible: false,
+        TIMER: null,
       }
     },
     created() {
@@ -313,6 +322,10 @@
         } // if end
       }); // getInfo end
     },
+    destroyed() {
+      clearInterval(this.TIMER);
+      this.TIMER = null;
+    },
     mounted() {},
     methods: {
       /** 营业期限 选择区间时间时 */
@@ -415,6 +428,8 @@
               // this.isConcretePeriod = false;
               this.periodLongTermVal = false;
             }
+          }else {
+            this.isReadFailVisible = true;
           }
         });
       },

src/views/system/goods/add/components/goodsinfomation.vue

@@ -437,7 +437,6 @@
           if ( res.code == 1 ) {
             this.cateFee = res.data.service_fee_ratio
             this.$store.commit('SET_CATEFEE',this.cateFee);
-            console.log(444,this.cateFee);
           }
         });
       },

src/views/system/goods/add/components/goodsparameter.vue

@@ -207,7 +207,7 @@ export default {
       ],
       singleSpecImgList: [],
       isViewPriceExp: false,
-      cateFee: 1,
+      cateFee: 0,
     } // return end
   },
   watch:{
@@ -219,6 +219,8 @@ export default {
   },
   created() {
     this.cateFee = this.$store.state.user.cateFee;
+    console.log("刚加载：",this.cateFee);
+    console.log(1111,this.$store.state.user.cateFee)
   },
   mounted() {
     if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) {
@@ -398,8 +400,11 @@ export default {
       if (jsPriceVal == "") {
         jsPriceVal = ''
       }
+      if (jsPriceVal > 0 && this.cateFee == 0) {
+        slPriceNum = jsPriceVal
+      }
       if (jsPriceVal > 0 && this.cateFee > 0) {
-        // slPriceNum = (jsPriceVal * 10000 - this.cateFee)/10000
+        console.log("动态：",this.cateFee);
         slPriceNum = (10000 - this.cateFee) * jsPriceVal /10000
       }