Merge remote-tracking branch 'origin/master'

src/views/system/config/config.vue

@@ -590,13 +590,6 @@
           <el-form-item v-if="form9.type=='hf'" label="汇付大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
             <el-input v-model="form9.hfOnlineRefundNotifyUrl" label="汇付分账回调地址"></el-input>
           </el-form-item>
-          <el-form-item label="是否开启微信发货" prop="isWeChatShipping">
-            <el-switch
-              v-model="form17.isWeChatShipping"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </el-form-item>
           <div class="footer">
             <el-button type="primary" @click="submitForm9">提 交</el-button>
           </div>
@@ -1157,6 +1150,14 @@
             </el-tooltip>
           </el-form-item>
 
+          <el-form-item label="是否开启微信发货" prop="isWeChatShipping">
+            <el-switch
+              v-model="form17.isWeChatShipping"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </el-form-item>
+
           <div class="footer">
             <el-button type="primary" @click="submitForm17">提 交</el-button>
           </div>