Merge branch 'feature/EK-627' of guanli/ngds-backend-ele into master

src/lang/en.js

@@ -859,7 +859,8 @@ export default {
     consignee: 'consignee',
     availableCountries: "Available countries",
     modifyAvailableCountries: "Modify available countries",
-    imagePreview: 'Image Preview'
+    imagePreview: 'Image Preview',
+    AutoMaintenance: 'Auto Maintenance'
   },
 
   // Administrator management

src/lang/zh.js

@@ -849,7 +849,8 @@ export default {
     modifyOrderPcNoHits: '是否要修改当前订单期数？',
     availableCountries: "可购买国家",
     modifyAvailableCountries: "修改可购买国家",
-    imagePreview: '图片预览'
+    imagePreview: '图片预览',
+    AutoMaintenance: '自动分期'
   },
 
   // 管理员管理

src/views/shop/goods-add.vue

@@ -26,6 +26,15 @@
                 <el-form-item :label="$t('shop.availableCountries')"><!-- 可购买国家 -->
                   <el-button type="primary" size="small" :disabled="!form.sellPriceStandard" @click="editAvailableCountries">{{ $t('shop.modifyAvailableCountries') }}</el-button>
                 </el-form-item>
+              <el-form-item :label="$t('shop.AutoMaintenance')"> <!-- 自动分期 -->
+                <el-switch
+                    v-model="form.autoMaintenance"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                    active-value="1"
+                    inactive-value="0">
+                </el-switch>
+              </el-form-item>
                 <el-form-item :label="$t('shop.inventory')"><!-- 库存 -->
                     <el-input v-model="form.storeNums"></el-input>
                 </el-form-item>
@@ -203,7 +212,8 @@ export default {
         categoryType: 1,
         sellPriceStandard: undefined,
         taxRate: 0,
-        nature: []
+        nature: [],
+        autoMaintenance: '1',
       },
       submitButtonStat: false,
       goodsType: [],
@@ -554,6 +564,7 @@ export default {
         cover: this.form.cover,
         // taxRate: this.form.taxRate
         nature: this.form.nature,
+        autoMaintenance: this.form.autoMaintenance,
       }
       addGoods(postData).then(response => {
         this.$message({

src/views/shop/index.vue

@@ -69,6 +69,15 @@
           <el-form-item :label="$t('shop.availableCountries')"><!-- 可购买国家 -->
             <el-button type="primary" size="small" @click="editAvailableCountries">{{ $t('shop.modifyAvailableCountries') }}</el-button>
           </el-form-item>
+            <el-form-item :label="$t('shop.AutoMaintenance')"> <!-- 自动分期 -->
+                <el-switch
+                        v-model="form.autoMaintenance"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        active-value="1"
+                        inactive-value="0">
+                </el-switch>
+            </el-form-item>
             <el-form-item :label="$t('shop.inventory')"> <!-- 库存 -->
               <el-input v-model="form.storeNums"></el-input>
             </el-form-item>
@@ -270,7 +279,8 @@
           pvSplit: '',
           categoryType: 1,
           sellType: 1,
-          taxRate: 0
+          taxRate: 0,
+          autoMaintenance: null,
         },
         submitButtonStat: false,
         goodsType: [],
@@ -505,6 +515,7 @@
             vueObj.form.coverOrigin = response.data.goodsInfo.COVER
             vueObj.form.cover = tool.getArImage(response.data.goodsInfo.COVER, '/files/')
             vueObj.availableCountriesTableForm.availableCountriesList = response.data.goodsInfo.SHOP_GOODS_NATURE
+            vueObj.form.autoMaintenance = response.data.goodsInfo.AUTO_MAINTENANCE
             const goods = JSON.parse(JSON.stringify(response.data.goodsInfo.SHOP_GOODS_NATURE))
             let nature = []
             goods.find(item => { //  表单数据