Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

config/index.js

@@ -14,9 +14,9 @@ module.exports = {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://192.168.0.62:8080', //wf
         // target: 'http://127.0.0.1:8080', 
-        // target: 'http://192.168.0.62:8080', //wf
+        target: 'http://localhost:8080', //wf
         // target: 'http://192.168.0.11', //ys
-        target: 'http://192.168.0.125:8080', //hyq
+        // target: 'http://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/pages/system/cardAndCouponManager/givingRecords.vue

@@ -91,14 +91,12 @@ export default {
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      currentList: [{
-        xxx: 'xxx'
-      }]
+      currentList: []
     }
   },
   mounted () {
     this.$nextTick(function () {
-      // this.getList()
+      this.getList()
     })
   },
   computed: {
@@ -122,14 +120,14 @@ export default {
       this.getList()
     },
     getList () { // 获取列表
-      // this.$ajax(this.$api.channelManager.getChannelList.url, {
-      //   method: this.$api.channelManager.getChannelList.method,
-      //   queryData: { ...this.postData, caseid: this.CaseId }
-      // }).then(res => {
-      //   this.currentList = res.list
-      //   this.postData.page = res.page
-      //   this.total = res.pagenum
-      // })
+      this.$ajax(this.$api.channelManager.getChannelList.url, {
+        method: this.$api.channelManager.getChannelList.method,
+        queryData: { ...this.postData, caseid: this.CaseId }
+      }).then(res => {
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
     },
     handleCurrentChange (val) { // 跳转到分页
       this.getList()

src/pages/system/goodsManager/goodManager/edit.vue

@@ -76,7 +76,7 @@
           <span>商品类别：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="detail.TypeId" placeholder="请选择商品类型">
+              <el-select v-model="TypeId" placeholder="请选择商品类型">
                 <el-option
                   v-for="item in types.list"
                   :key="item.TypeId"
@@ -143,7 +143,15 @@ export default {
     },
     Image () {
       return ((this.detail.Images || [])[0] || {}).ImgUrl
-    }
+    },
+    TypeId: {
+      get () {
+        return this.detail.TypeId
+      },
+      set (val) {
+        this.UpdateInfo({ ...this.detail, TypeId: val })
+      },
+    },
   },
   methods: {
     ...mapGoodsActions([

src/pages/system/goodsManager/goodsTypeManager/add.vue

@@ -9,7 +9,7 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
-                maxlength="10"
+                maxlength="6"
                 clearable>
               </el-input>
             </div>

src/pages/system/goodsManager/goodsTypeManager/edit.vue

@@ -9,7 +9,7 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
-                maxlength="10"
+                maxlength="6"
                 clearable>
               </el-input>
             </div>

src/pages/system/newOrder/newOrderList/index.vue

@@ -231,7 +231,7 @@ export default {
       console.log(this.user)
       let caseid = this.caseid
       let id = this.userInfo.UserId
-      const wsuri = `${window.location.origin.replace('http', 'ws')}/api-v2/common/MQ/websocket/${caseid}/${id}`
+      const wsuri = `${window.location.origin.replace('http', 'ws')}/api-v2/common/MQ/websocket/${caseid}/${id}?token=${localStorage.getItem('JWT')}`
       // const wsuri = `ws://192.168.0.11/api/guest/MQ/websocket/${caseid}/${id}`
       try {
         this.websock = new WebSocket(wsuri)