bug修改

2024-01-30 11:31:26 +08:00
parent f35a48591a
commit 3b381d8e1f
10 changed files with 2174 additions and 2128 deletions
--- a/src/api/finance/marketing.js
+++ b/src/api/finance/marketing.js
@@ -120,7 +120,7 @@ export default {
  getProductByPage(page) {
    // 商品销售列表
    return request({
-      url: `/${service_name}/mallProductInfo/getPage`,
+      url: `/${service_name}/mallProductInfo/getByPage`,
      method: 'post',
      data: page
    })
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -1,9 +1,16 @@
 <template>
  <div class="photo-container">
    <div>
-      <el-upload class="avatar-uploader" :action="uploadUrl"  :show-file-list="false"
-        :on-success="uploadSuccess" :on-remove="removeUrl"
-        :data="{ code: code, ossKey: 'xingyou2', pathKey: 'banner-group', encrypt: 'PUBLIC' }">
+      <el-upload
+        accept=".png,.jpg"
+        class="avatar-uploader"
+        :action="uploadUrl"
+        :show-file-list="false"
+        :on-success="uploadSuccess"
+        :on-remove="removeUrl"
+        :before-upload="beforeAvatarUpload"
+        :data="{ code: code, ossKey: 'xingyou2', pathKey: 'banner-group', encrypt: 'PUBLIC' }"
+      >
        <img v-if="photoUrl" :src="photoUrl" class="avatar" />
        <i v-else class="el-icon-plus avatar-uploader-icon" />
      </el-upload>
@@ -47,10 +54,10 @@ export default {
    }
  },
  watch: {
-    photo: function (newVal, oldVal) {
+    photo: function(newVal, oldVal) {
      this.photoUrl = newVal
    },
-    isPrivate: function (newVal, oldVal) {
+    isPrivate: function(newVal, oldVal) {
      this.changeUploadUrl
    }
  },
@@ -80,6 +87,14 @@ export default {
      } else {
        this.$message.error(res.msg)
      }
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 < 50
+
+      if (!isLt2M) {
+        this.$message.error('图片大小不能超过50KB! 请重新上传!')
+      }
+      return isLt2M
    }
  }
 }
--- a/src/views/marketing/advertisement/advertisementAdd.vue
+++ b/src/views/marketing/advertisement/advertisementAdd.vue
@@ -78,9 +78,17 @@ export default {
  },
  methods: {
    handleSubmit() {
+      var start = new Date(this.advertisement.startTime).getTime()
+      var end = new Date(this.advertisement.endTime).getTime()
+
+      console.log('----', start, end)
      this.$refs['form'].validate(valid => {
        if (valid) {
-          this.save()
+          if (start > end) {
+            this.$message.error('开始时间不得大于结束时间！')
+          } else {
+            this.save()
+          }
        }
      })
    },
@@ -101,13 +109,7 @@ export default {
        this.advertisement.positionImage = res.data.publicUrl
      }
    },
-    handleSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.save(this.advertisement)
-        }
-      })
-    },
+
    close() {
      this.$emit('closeDialog')
    }
--- a/src/views/marketing/advertisement/advertisementList.vue
+++ b/src/views/marketing/advertisement/advertisementList.vue
@@ -8,8 +8,8 @@
          </el-form-item>
          <el-form-item label="是否上线：">
            <el-select v-model="page.params.isDownline" placeholder="状态" clearable @keyup.enter.native="getList">
-              <el-option label="是" value="0" />
-              <el-option label="否" value="1" />
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
            </el-select>
          </el-form-item>
          <el-form-item label="到期时间：">
@@ -232,7 +232,7 @@ export default {
        confirmButtonText: '确定',
        callback: action => {
          if (action == 'confirm') {
-            this.delData = {}
+            this.delData = { ids: [] }
            this.delData.ids.push(row)
            console.log('----', this.delData)
            loadingFn.call(
--- a/src/views/marketing/advertisement/advertisementUpdate.vue
+++ b/src/views/marketing/advertisement/advertisementUpdate.vue
@@ -76,16 +76,23 @@ export default {
        advertiseName: [{ required: true, message: '请输入广告名称', trigger: 'blur' }],
        startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
        endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
-        picture: [{ required: true, message: '请上传广告图片', trigger: 'change' }],
+        positionImage: [{ required: true, message: '请上传广告图片', trigger: 'change' }],
        advertiseUrl: [{ required: true, message: '请输入广告链接', trigger: 'blur' }]
      }
    }
  },
  methods: {
    handleSubmit() {
+      var start = new Date(this.advertisement.startTime).getTime()
+      var end = new Date(this.advertisement.endTime).getTime()
+
      this.$refs['form'].validate(valid => {
        if (valid) {
-          this.update()
+          if (start > end) {
+            this.$message.error('开始时间不得大于结束时间！')
+          } else {
+            this.update()
+          }
        }
      })
    },
--- a/src/views/order/orderListCancle.vue
+++ b/src/views/order/orderListCancle.vue
@@ -11,7 +11,7 @@
            <span>{{ detailData.orderCode }}</span>
          </el-form-item>
        </el-col>
-        <el-col :span="15">
+        <el-col :span="18">
          <el-form-item label="取消说明" prop="cancelMark">
            <el-input v-model="detailData.cancelMark" placeholder="请输入取消说明" type="textarea" />
          </el-form-item>
@@ -21,7 +21,7 @@
            <span>¥{{ detailData.marketPrice }}</span>
          </el-form-item>
        </el-col>
-        <el-col :span="15">
+        <el-col :span="18">
          <el-form-item label="可退积分">
            <el-input v-model="detailData.integral" disabled />
          </el-form-item>
--- a/src/views/order/orderListDetail.vue
+++ b/src/views/order/orderListDetail.vue
@@ -1,6 +1,9 @@
 <template>
  <div class="article-manager">
    <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
+      <div style="background: #f3f3f3;height:60px">
+        <span style="line-height:60px;margin:0px  30px;color:red; font-size:16px"> 当前订单状态：{{ detailData.orderStatus | orderStatus }}</span>
+      </div>
      <el-descriptions title="基本信息" class="text" direction="vertical" :column="6" border>
        <el-descriptions-item label="订单编号">{{ detailData.orderCode }}</el-descriptions-item>
        <el-descriptions-item label="用户账号">{{ detailData.acctId }}</el-descriptions-item>
--- a/src/views/order/orderRefundListDetail.vue
+++ b/src/views/order/orderRefundListDetail.vue
@@ -54,12 +54,24 @@
        <el-descriptions-item label="处理时间">{{ OrderInfoRecord.createTime }}</el-descriptions-item>
        <el-descriptions-item label="操作备注">{{ OrderInfoRecord.remark }} </el-descriptions-item>
      </el-descriptions>
+
+      <div v-if="detailData.refundStatus == '0'">
+        <!-- <div v-if="false"> -->
+        <el-col :span="24" style="text-align: right;margin:30px 0px">
+          <el-button @click="auth(detailData)" type="primary">退款审核</el-button>
+        </el-col>
+      </div>
    </el-card>
+    <el-dialog title="审核" :visible.sync="verifyDialog" width="45%" :append-to-body="true">
+      <orderRefundListVerify @getList="getList" @closeDialog="closeDialog" v-if="verifyDialog" :detailData="detailData" />
+    </el-dialog>
  </div>
 </template>

 <script>
+import orderRefundListVerify from './orderRefundListVerify'
 export default {
+  components: { orderRefundListVerify },
  filters: {
    refundStatus(e) {
      switch (e) {
@@ -96,7 +108,7 @@ export default {
  data() {
    return {
      OrderInfoRecord: {},
-
+      verifyDialog: false,
      grid: {
        xl: 6,
        lg: 8,
@@ -143,6 +155,12 @@ export default {
      } else {
        return sums
      }
+    },
+    // 取消
+    auth(row) {
+      this.detailData = row
+      this.verifyDialog = true
+      console.log(row)
    }
  }
 }
--- a/src/views/statistics/productStatisticsList.vue
+++ b/src/views/statistics/productStatisticsList.vue
@@ -252,10 +252,12 @@ export default {

    var DaysAgo = this.timeBefore()
    var sevenDaysAgo = this.timeBefore7()
-    console.log('sevenDaysAgo', sevenDaysAgo, DaysAgo)

    this.createTime = sevenDaysAgo + '/' + DaysAgo

+    this.Time = [new Date(sevenDaysAgo), new Date(DaysAgo)]
+    this.createTime2 = [new Date(sevenDaysAgo), new Date(DaysAgo)]
+    
    console.log('createTime', this.createTime)

    this.page.params.startTime = sevenDaysAgo
@@ -266,7 +268,6 @@ export default {
  },

  methods: {
-
    closeLabel(label) {
      let index = this.dataLabel.indexOf(this.dataLabel.filter(d => d.id == label.id)[0])
      this.dataLabel.splice(index, 1)
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
      [process.env.VUE_APP_BASE_API]: {
        // target: `cls`,
        // target: `http://192.168.0.6:38080`,
-        target: `http://192.168.0.18:38080`,
+        target: `http://192.168.0.24:38080`,
        // target: `http://192.168.1.83:38080`,
        // target: 'http://222.132.26.119:8081',
        // target: `https://www.xingoil.com/adminapi`,