23.4.7

6548d789 · zhangmengjie · 8e5d7127 · 6548d789 · 6548d789 · 6548d789
Commit 6548d789 authored Apr 07, 2023 by zhangmengjie
7 changed files
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -31,13 +31,13 @@ export function register(data) {
 }
 // 获取用户详细信息
-export function getInfo() {
+export function getInfo(query) {
  return request({
    url: '/getInfo',
-    method: 'get'
+    method: 'get',
+    params: query
  })
 }
 // 退出方法
 export function logout() {
  return request({

--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -78,7 +78,7 @@ export default {
      dialogVisible: false,
      hideUpload: false,
      baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
+      uploadImgUrl: "http://xinrenli.nyinhong.com/api/xinrenli/file/upload", // 上传的图片服务器地址
      headers: {
        Authorization: "Bearer " + getToken(),
      },
@@ -158,7 +158,7 @@ export default {
    // 上传成功回调
    handleUploadSuccess(res, file) {
      if (res.code === 200) {
-        this.uploadList.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
+        this.uploadList.push({url: res.data.url });
        this.uploadedSuccessfully();
      } else {
        this.number--;

--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -49,7 +49,8 @@ const user = {
    // 获取用户信息
    GetInfo({ commit, state }) {
      return new Promise((resolve, reject) => {
-        getInfo().then(res => {
+        console.log('111111111')
+        getInfo({adminTag:'adminTag'}).then(res => {
          const user = res.data.user
          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
          if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组

--- a/src/views/marketing/index.vue
+++ b/src/views/marketing/index.vue
@@ -75,6 +75,7 @@ export default {
    handleAdd() {
      let that = this;
      that.title = "添加优惠券";
+      this.$refs['refDialogFile'].form = {}
      that.isEdit = true
      that.dialogVisible = true;
    },

--- a/src/views/orderform/components/index.vue
+++ b/src/views/orderform/components/index.vue
@@ -3,7 +3,7 @@
    <el-dialog :title='title' :visible.sync="dialogVisibl" width="30%" :before-close="dialog" center>
      <div v-if="control != 4">
        <!-- 图片说明 -->
-        <el-image v-if="control == '1'" style="width:100%; " :src="url" :preview-src-list="srcList">
+        <el-image v-if="control == '1'" style="width:100%; " :src="idt" :preview-src-list="srcList">
        </el-image>
        <!-- 视频说明 -->
        <comvideo v-if="control == '2'"></comvideo>

--- a/src/views/orderform/index.vue
+++ b/src/views/orderform/index.vue
@@ -40,8 +40,8 @@
      </el-table-column>
      <el-table-column prop="actualAmount" label="沟通后金额(元)" :show-overflow-tooltip="true" align="center">
        <template slot-scope="scope">
-          <el-input v-if="!scope.row.actualAmount"   class="delInput"
+          <el-input v-if="!scope.row.actualAmount" class="delInput" type='number' v-model="scope.row.dataName"
- type='number' v-model="scope.row.dataName"  @change="cc( scope.row)" placeholder="请输入联系人姓名" clearable />
+            @change="cc(scope.row)" placeholder="请输入联系人姓名" clearable />
          <div v-else>{{ scope.row.actualAmount }}</div>
        </template>
      </el-table-column>
@@ -49,7 +49,7 @@
      </el-table-column>
      <el-table-column prop="address" label="图片说明" :show-overflow-tooltip="true" align="center">
        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="imageCaption(scope, '1')">查看详情</el-button>
+          <el-button type="text" size="small" @click="imageCaption(scope.row, '1')">查看详情</el-button>
        </template>
      </el-table-column>
      <el-table-column prop="address" label="视频说明" :show-overflow-tooltip="true" align="center">
@@ -84,10 +84,11 @@
      </el-table-column>
    </el-table>
    <!-- 其他 -->
-    <comindex :dialogVisibl="dialogVisible" :idt="id" @visivie='visivie' @clickDialog="clickDialog" :control="control" ref="refIndex" :bindex="bb"></comindex>
+    <comindex :dialogVisibl="dialogVisible" :idt="id" @visivie='visivie' @clickDialog="clickDialog" :control="control"
+      ref="refIndex" :bindex="bb"></comindex>
    <!-- 修改 详情 -->
    <commodify :title="title" :dialogVisibl="dialogVi" @diaisibl="diaisibl" @onSubmit="onSubmit" :disabled="disabled"
-      ref="refModify" ></commodify>
+      ref="refModify"></commodify>
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />
  </div>
@@ -149,7 +150,7 @@ export default {
        value: '6',
        label: '已退款'
      }],
-      disabled:false,
+      disabled: false,
      particulars: {},
      tableData: [],
      // 日期范围
@@ -182,8 +183,8 @@ export default {
    comindex,
    commodify
  },
-  watch:{
+  watch: {
-  //监听器的作用就是用来监听数据是否发生了变化，变化后可以进行一些其他操作
+    //监听器的作用就是用来监听数据是否发生了变化，变化后可以进行一些其他操作
    //只要没有发生变化，就没有办法进行其他的操作
    bb: function (newData, oldData) {
      //newData是更新后的数据
@@ -234,26 +235,40 @@ export default {
    },
    // 打开查看详情
    imageCaption(sta, val) {
+      let self = this
      switch (val) {
        case '1':
+          if (sta.fileVos && sta.fileVos.length) {
+            self.id = sta.fileVos[0].url
+            self.dialogVisible = true
+          } else {
+            this.$message({
+              message: '暂无图片',
+              type: 'warning'
+            });
+          }
          this.control = val
+          // this.dialogVisible = true
          break;
        case '2':
          this.control = val
+          this.dialogVisible = true
          break;
        case '3':
          this.control = val
+          this.dialogVisible = true
          break;
        case '4':
          this.id = sta.id
          this.control = val
+          this.dialogVisible = true
          break;
        case '5':
          this.id = sta.id
          this.control = val
+          this.dialogVisible = true
          break;
      }
-      this.dialogVisible = true
    },
    cc(index) {
      console.log("更改后的值：", index);
@@ -275,11 +290,11 @@ export default {
    },
    // 其他 弹窗关闭
    visivie() {
      this.dialogVisible = false
    },
    // 其他 确认
-    clickDialog(){
+    clickDialog() {
      if (this.control == '5') {
        var params = {
          reasonsForRejection: this.$refs['refIndex'].form.name,
@@ -295,7 +310,7 @@ export default {
        })
      } else if (this.control == '4') {
        var params = {
-          reasonsForRejection: this.$refs['refIndex'].form.money,
+          actualAmount: this.$refs['refIndex'].form.money,
          status: 2,
          id: this.id
        }
@@ -321,7 +336,6 @@ export default {
 </script>
 <style  scoped  lang="scss">
 ::v-deep .delInput input::-webkit-outer-spin-button,
 ::v-deep .delInput input::-webkit-inner-spin-button {
  -webkit-appearance: none !important;

--- a/src/views/statement/index.vue
+++ b/src/views/statement/index.vue
@@ -113,7 +113,7 @@ export default {
                show: false
              },
              data: [
-                { value: this.cache.totalMoney, name: '累计成交额' }
+                { value: this.cache.money, name: '累计成交额' }
              ]
            }
          ]
@@ -239,12 +239,12 @@ export default {
          },
          series: [
            {
-              name: 'Access From',
+              // name: 'Access From',
              type: 'pie',
              radius: '50%',
              data: [
                { value: this.cache.accomplish, name: '已完成订单' },
-                { value: this.cache.contrastOrder, name: '未完成订单' },
+                { value: this.cache.noAccomplish, name: '未完成订单' },
              ],
              emphasis: {
                itemStyle: {