Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

package.json

@@ -28,6 +28,8 @@
     "build:prod-jkj": "vue-cli-service build --mode prod-jkj",
     "build:prod-kyt": "vue-cli-service build --mode prod-kyt",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:prod-cqxzt": "vue-cli-service build --mode prod-cqxzt",
+    "build:prod-bjyjb": "vue-cli-service build --mode prod-bjyjb",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/views/his/storeProductCategory/index.vue

@@ -268,8 +268,11 @@ export default {
     },
     handleAvatarSuccess(res, file) {
         if(res.code==200){
-          this.form.imgUrl=res.url;
-          self.$forceUpdate()
+          // this.form.imgUrl=res.url;
+          
+          this.form.pic=res.url;
+         
+          this.$forceUpdate()
         }
         else{
           this.msgError(res.msg);

src/views/system/config/config.vue

@@ -1187,6 +1187,13 @@
     </el-input>
   </el-tooltip>
 </el-form-item>
+ <el-form-item label="是否允许用户暂停" prop="isAllowUserPause" label-width="120">
+          <el-switch
+            v-model="form18.isAllowUserPause"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </el-form-item>
            <el-form-item label="可查看评论条数" v-if="false">
              <el-tooltip class="item" effect="dark" content="在评论区可以查看的历史评论条数，默认200" placement="top-end">
                <el-input-number  v-model="form18.viewCommentNum" :min="1"></el-input-number>