Merge remote-tracking branch 'origin/master'

# Conflicts: # src/page/login/index.vue

Merge remote-tracking branch 'origin/master'
# Conflicts: # src/page/login/index.vue
ed06e8e8 · fuqiang · fdc23120 · b0f6c22c · ed06e8e8 · ed06e8e8
Commit ed06e8e8 authored Jul 19, 2022 by fuqiang
8 changed files
--- a/src/components/ckeditor/index.vue
+++ b/src/components/ckeditor/index.vue
@@ -7,11 +7,13 @@
      :mode="mode"
      @onChange="onChange"
      @onCreated="onCreated" />
  </div>
 </template>
 <script>
  import Vue from 'vue'
+  import {Uploader} from '@/util/oss'
  import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
  import "@wangeditor/editor/dist/css/style.css"
@@ -30,7 +32,16 @@
                MENU_CONF: {
                  uploadImage: {
                    async customUpload(file, insertFn) {
-                      let r = await UPLOADER.upload('images', file)
+                      let bucket = ''
+                      if (file.type.startsWith('image')) {
+                        bucket = 'images'
+                      } else if (file.type.startsWith('video')) {
+                        bucket = 'videos'
+                      } else {
+                        req.onError('不支持的文件格式')
+                        return
+                      }
+                      let r = await Uploader.upload(bucket, file)
                      insertFn(r.url, '', r.url)
                    }
                  }
@@ -56,12 +67,13 @@
            this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
          },
          onChange(editor) {
-            //console.log(editor.getHtml())
            this.$emit('changed', editor.getHtml())
          }
      },
-      mounted() {
-          this.html = this.content
+    mounted() {
+      // alert("[ mounted ] this.content: "+this.content)
+      this.html = this.content
      },
      beforeDestroy() {
          if(this.editor) {

--- a/src/const/crud/mall/merchantMallorder.js
+++ b/src/const/crud/mall/merchantMallorder.js
@@ -38,7 +38,8 @@ export const tableOption = {
      "label": "状态",
      "prop": "state",
      "search": true,
-      "dicUrl": "/admin/merchantMallOrder/getMerchantOrderStateOptions",
+      "dicUrl": "/admin/mallOrder/getOrderStateOptions",
    },
    {
      "type": "input",

--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -4,7 +4,7 @@
      <div class="login-logo">
        <img src="/img/logo.jpg" alt="" />
      </div>
-      <p class="login-tip">{{ website.title }}</p>
+      <p class="login-tip">巨雾商家管理后台</p>
      <div class="login-border">
        <div class="login-main">
 <!--          <h4 class="login-title">
@@ -33,9 +33,7 @@
        </div>
      </div>
    </div>
-    <div class="login-copyright">
+    <div class="login-copyright">All Rights Reserved</div>
-      {{ website.copyright }}
-    </div>
    <top-color v-show="false" />
  </div>
 </template>

--- a/src/views/businessGoods/goodsEdit/goods_api.js
+++ b/src/views/businessGoods/goodsEdit/goods_api.js
@@ -41,15 +41,25 @@ export function getGoodsDetails(query) {
 }
+// addOrEditGoods(this.form)
+//   .then((res)=>{
+//     this.$message.success('添加成功')
+//     this.$emit('success')
+//   }).catch(e => {
+//   this.$message.success('添加失败')
+// });
+// }).catch(() => {
+//   this.tableLoading = false
+// })
+// export function addOrEditGoods(data) {
+//   return request({
+//     url: '/admin/merchantMallGoods/addOrEditGoods',
+//     method: 'post',
+//     params: data
+//
+//   })
+// }
-export function addOrEditGoods(data) {
-  return request({
-    url: '/admin/mallGoods/addOrEditGoods',
-    method: 'post',
-    params: data
-  })
-}
 /*** 自定义添加 ***/

--- a/src/views/businessGoods/goodsEdit/goods_edit.vue
+++ b/src/views/businessGoods/goodsEdit/goods_edit.vue
@@ -189,6 +189,7 @@
    getGoodsDetails,
    addOrEditGoods,
    getMerchantByAccount,
+    addOrEdit
  } from './goods_api.js'
  export default {
@@ -687,23 +688,26 @@
            {account: account}
          ).then(response => {
            this.form.merchantId=response.data.data.id
+            this.$http.post('/admin/merchantMallGoods/addOrEditGoods',JSON.stringify(this.form),
-            this.$http.post('/admin/mallGoods/addOrEdit',JSON.stringify(this.form),
              {headers:{'Content-Type':'application/json;charset=UTF-8'}})
              .then((res)=>{
-                this.$message.success('添加成功')
+                this.$message.success('操作成功')
                this.$emit('success')
              }).catch(e => {
-                this.$message.success('添加失败')
+              this.$message.success('操作失败')
            });
          }).catch(() => {
            this.tableLoading = false
          })
        }else{
-          addOrEditGoods(this.form).then(data => {
+          this.$http.post('/admin/merchantMallGoods/addOrEditGoods',JSON.stringify(this.form),
-            this.$message.success('修改成功')
+            {headers:{'Content-Type':'application/json;charset=UTF-8'}})
-            this.$emit('success')
+            .then((res)=>{
-          }).catch(() => {
+              this.$message.success('操作成功')
+              this.$emit('success')
+            }).catch(e => {
+            this.$message.success('操作失败')
          });
        }
      }

--- a/src/views/businessGoods/index.vue
+++ b/src/views/businessGoods/index.vue
@@ -22,6 +22,7 @@
                <el-button  type="button" size="small"
                            @click="lookDetail(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
                <el-button  type="button" size="small"
+                            v-if="scope.row.state!=0"
                            @click="handleUpdate(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">编辑</el-button>
                <el-button  type="button" size="small"
                            @click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button>
@@ -98,10 +99,6 @@
             this.id=row.id
              this.goodsEditVue=true
          }
-          // console.log("执行编辑方法")
-          // this.id=row.id
-          // console.log("赋值id:"+row.id)
-          // this.goodsEditVue=true
        },
        // 添加
        add() {

--- a/src/views/businessOrder/details.vue
+++ b/src/views/businessOrder/details.vue
@@ -309,7 +309,7 @@
      loadInfo() {
        this.loading = true
        getOrderInfo({
-          orderNo: this.id
+          id: this.id
        }).then(r => {
          this.loading = false
          this.info = this.zmRes(r)

--- a/src/views/businessOrder/index.vue
+++ b/src/views/businessOrder/index.vue
@@ -21,7 +21,7 @@
                <el-button  type="button" size="small"
                            @click="checkTheDetails(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
                <el-button  type="button" size="small"
-                            v-if="scope.row.state == 1 || scope.row.state == 2"
+                            v-if="qwlAuth(scope.row)>=0"
                            @click="viewLogistics(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">查看物流</el-button>
                <el-button type="button" size="small"
                           v-if="scope.row.state == 0"
@@ -184,7 +184,12 @@
            }
          },
-          // 取消订单
+          qwlAuth: function (row) {
+            let str=row.state
+            let text='3,6'//待收货，已完成
+            return text.search(str)
+          },
+          // 是否可以取消订单
          cancelOrderButAuth: function (row) {
            let str=row.state
            let text='0,1,2,3,4'
@@ -267,7 +272,7 @@
         },
          // 查看详情
          checkTheDetails(row){
-            this.$router.push('/businessOrder/details?id=' + row.orderNo)
+            this.$router.push('/businessOrder/details?id=' + row.id)
          },
          // 列表查询
          getList(page, params) {