Merge remote-tracking branch 'origin/master'

src/views/hisStore/storeProduct/index.vue

@@ -1546,8 +1546,8 @@ export default {
         if(this.form.tuiCateId!=null){
           this.form.tuiCateId = response.data.tuiCateId.toString();
         }
-
-        this.form.isDrug = response.data.isDrug ? response.data.isDrug.toString() : "1";
+        // this.form.isDrug = response.data.isDrug ? response.data.isDrug.toString() : "1";
+        this.form.isDrug = response.data.isDrug === 0 ? "0" : (response.data.isDrug ? response.data.isDrug.toString() : "1");
         if (this.form.drugImage != null) {
           this.drugImageArr = this.form.drugImage.split(",");
         }

src/views/system/config/config.vue

@@ -747,6 +747,14 @@
       <el-form-item   label="快递鸟地址url" prop="kdnAddressUrl">
           <el-input   v-model="form13.kdnAddressUrl"  label="请输入kdnAddressUrl"></el-input>
       </el-form-item>
+      <el-form-item label="最低定金金额" prop="shares">
+              <el-input-number v-model="form13.retainer" :min="100"   label="最低定金金额"></el-input-number>
+      </el-form-item>
+      <el-form-item   label="比率" prop="rate">
+          <el-input   v-model="form13.rate"  label="请输入比率">
+            <template slot="append">%</template>
+          </el-input>
+      </el-form-item>
       <el-form-item   label="是否开启erp">
           <el-switch
             v-model="form13.erpOpen"