修改商品详情上传及评测视频

src/router/index.js

@@ -80,7 +80,18 @@ export const constantRoutes = [
         meta: {title: '个人中心', icon: 'user'}
       }
     ]
-  }, {
+  },
+  {
+    path: '/yshop/materia/index',
+    name: `images`,
+    meta: {
+      title: '上传图片',
+      noCache: true
+    },
+    component: (resolve) => require(['@/components/editorMaterial/index'], resolve),
+    hidden: true
+  },
+  {
     path: '/dict',
     component: Layout,
     hidden: true,
@@ -172,7 +183,7 @@ Router.prototype.push = function push(location) {
 
 export default new Router({
   base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/",
-  mode: 'history', // 去掉url中的#
+  // mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({y: 0}),
   routes: constantRoutes
 })

src/views/bxg/activity/seckill/form.vue

@@ -714,7 +714,7 @@ export default {
     addCustomDialog () {
       window.UE.registerUI('yshop', function (editor, uiName) {
         let dialog = new window.UE.ui.Dialog({
-          iframeUrl: '/yshop/materia/index',
+          iframeUrl: '#/yshop/materia/index',
           editor: editor,
           name: uiName,
           title: '上传图片',

src/views/bxg/shop/goods/form.vue

@@ -213,8 +213,9 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="商品详情：">
-<!--              <vue-ueditor-wrap v-model="formValidate.description" :config="myConfig"  @beforeInit="addCustomDialog"  style="width: 90%;"></vue-ueditor-wrap>-->
+              <ueditor-wrap v-model="formValidate.description" :config="myConfig"
-              <editor v-model="formValidate.description" :config="myConfig"  @beforeInit="addCustomDialog"></editor>
+                            @beforeInit="addCustomDialog"  style="width: 90%;"></ueditor-wrap>
+<!--              <editor v-model="formValidate.description" :config="myConfig"  @beforeInit="addCustomDialog"></editor>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -366,9 +367,9 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import MaterialList from '@/components/material'
 import singlePic from '@/components/singlematerial'
-import VueUeditorWrap from 'vue-ueditor-wrap';
+import UeditorWrap from "vue-ueditor-wrap";
 export default {
-  components: { editor, picUpload, mulpicUpload, Treeselect, MaterialList, VueUeditorWrap, singlePic },
+  components: { editor, picUpload, mulpicUpload, Treeselect, MaterialList, UeditorWrap, singlePic },
   data() {
     return {
       //品牌列表
@@ -796,9 +797,11 @@ export default {
       }
     },
     addCustomDialog () {
-      window.UE.registerUI('yshop', function (editor, uiName) {
+      window.UE.registerUI(
+        "yshop",
+        function (editor, uiName) {
         let dialog = new window.UE.ui.Dialog({
-          iframeUrl: '/yshop/materia/index',
+          iframeUrl: '#/yshop/materia/index',
           editor: editor,
           name: uiName,
           title: '上传图片',

src/views/bxg/shop/storeBrand/index.vue

@@ -10,8 +10,8 @@
       </div>
       <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="700px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
 <!--          <el-form-item label="品牌ID">-->
 <!--            <el-input v-model="form.id" style="width: 370px;" />-->
 <!--          </el-form-item>-->
@@ -21,15 +21,21 @@
           <el-form-item label="品牌描述" prop="brandDescription">
             <el-input v-model="form.brandDescription" type="textarea" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="排序">
-            <el-input v-model="form.sort" style="width: 370px;" />
-          </el-form-item>
           <el-form-item label="图标">
             <MaterialList v-model="picArr" type="image" :num="1" :width="150" :height="150" />
           </el-form-item>
           <el-form-item label="背景图">
             <MaterialList v-model="picArr1" type="image" :num="1" :width="150" :height="150" />
           </el-form-item>
+          <el-form-item label="虚拟商品数量" prop="goodsNumber">
+            <el-input v-model="form.goodsNumber" type="number" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="虚拟销售量(w)" prop="sellNumber">
+            <el-input v-model="form.sellNumber" type="number" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="排序">
+            <el-input v-model="form.sort" style="width: 370px;" />
+          </el-form-item>
           <el-form-item label="状态">
             <el-radio-group v-model="form.isShow" style="width: 178px">
               <el-radio :label="1">显示</el-radio>
@@ -94,7 +100,8 @@ import MaterialList from "@/components/material";
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '品牌', url: '/bxg/api/yxStoreBrand', sort: 'id,desc', crudMethod: { ...crudYxStoreBrand }})
-const defaultForm = { id: null, brandName: null, sort: null, pic: null,backgroundImage:null,isShow: null, createTime: null, updateTime: null, isDel: null, tenantId: null }
+const defaultForm = { id: null, brandName: null, sort: 0, goodsNumber:'',sellNumber:'',
+  pic: null,backgroundImage:null,isShow: null, createTime: null, updateTime: null, isDel: null, tenantId: null }
 export default {
   name: 'YxStoreBrand',
   components: { pagination, crudOperation, rrOperation, udOperation ,MaterialList},

src/views/bxg/shop/userlevel/form.vue

@@ -23,9 +23,8 @@
       <el-form-item label="会员图标">
         <MaterialList v-model="form.iconArr" style="width: 300px" type="image" :num="1" :width="150" :height="150" />
       </el-form-item>
-      <el-form-item label="是否显示">
+      <el-form-item label="所需成长值">
-        <el-radio v-model="form.isShow" :label="1">是</el-radio>
+        <el-input v-model="form.growthValue" rows="3"  type="number" />
-        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">否</el-radio>
       </el-form-item>
       <el-form-item label="权益说明">
         <el-input v-model="form.benefit" rows="3" type="textarea" />
@@ -33,6 +32,10 @@
       <el-form-item label="规则说明">
         <el-input v-model="form.explain" rows="3" type="textarea" />
       </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.isShow" :label="1">是</el-radio>
+        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="text" @click="cancel">取消</el-button>
@@ -72,7 +75,9 @@ export default {
         imageArr: [],
         iconArr: [],
         explain: '',
+        benefit:'',
         addTime: '',
+        growthValue:'',
         isDel: ''
       },
       rules: {

src/views/bxg/wechat/config/robot.vue

@@ -4,6 +4,9 @@
       <el-form-item label="Webhook地址">
         <el-input v-model="form.robotUrl" style="width: 800px;"/>
       </el-form-item>
+      <el-form-item label="机器人消息跳转地址">
+        <el-input v-model="form.cardActionUrl" style="width: 800px;"/>
+      </el-form-item>
       <el-form-item label="">
         <el-button type="primary" @click="doSubmit">提交</el-button>
       </el-form-item>
@@ -27,7 +30,8 @@ export default {
     return {
       delLoading: false,
       form: {
-        robotUrl:''
+        robotUrl:'',
+        cardActionUrl:''
       },
       rules: {
       }

src/views/bxg/yxEvaluation/index.vue

@@ -215,9 +215,9 @@ export default {
         xs: 24
       },
       rules: {
-        videoInput: [
+        // videoInput: [
-          { required: true, message: '评测视频未上传', trigger: 'blur' }
+        //   { required: true, message: '评测视频未上传', trigger: 'blur' }
-        ],
+        // ],
         product: [
           { required: true, message: '评测关联商品不能为空', trigger: 'blur' }
         ],
@@ -342,7 +342,7 @@ export default {
         // console.log('data',data)
         this.product=[Number(data.cateId),Number(data.id)]
         // this.product=[50,105]
-        // this.product=data
+        this.form.product=this.product[1]
         console.log( '111',this.product,typeof(this.product));
       }