Browse Source

修改页面

潘超林 4 months ago
parent
commit
b4aea81511
3 changed files with 35 additions and 44 deletions
  1. BIN
      src/assets/images/profile.jpg
  2. 3 1
      src/store/modules/user.js
  3. 32 43
      src/views/manage/order.vue

BIN
src/assets/images/profile.jpg


+ 3 - 1
src/store/modules/user.js

@@ -55,7 +55,9 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/login-background.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          console.log('123123123', avatar);
+
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

+ 32 - 43
src/views/manage/order.vue

@@ -692,65 +692,54 @@ export default {
       }
     },
     getstatisticsOrder() {
-      statisticsOrderNum()
-        .then((res) => {
-          if (res) {
-            this.orderStatistics = res;
-          }
-        })
-        .catch((err) => {
-          this.$modal.msgError(err);
-        });
+      statisticsOrderNum().then((res) => {
+        if (res.code == 200) {
+          this.orderStatistics = res;
+        } else {
+          this.$modal.msgError(res.msg);
+        }
+      });
     },
 
     /** 查询参数列表 */
     getList() {
       this.selectList = [];
       this.loading = true;
-      queryUserOrderByShopId(this.addDateRange(this.queryParams, this.dateRange))
-        .then((response) => {
-          let list = response.data.records;
-          let totalList = [];
-          for (let i = 0; i < list.length; i++) {
-            if (list[i].goodsInfo) {
-              var goods = JSON.parse(list[i].goodsInfo);
-              for (let a = 0; a < goods.length; a++) {
-                let bb = {};
-                if (goods[a].specsValue.length > 0) {
-                  for (let s = 0; s < goods[a].specsValue.length; s++) {
+      queryUserOrderByShopId(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
+          if (response.code == 200) {
+            let list = response.data.records;
+            let totalList = [];
+            for (let i = 0; i < list.length; i++) {
+              if (list[i].goodsInfo) {
+                var goods = JSON.parse(list[i].goodsInfo);
+                for (let a = 0; a < goods.length; a++) {
+                  let bb = {};
+                  if (goods[a].specsValue.length > 0) {
+                    for (let s = 0; s < goods[a].specsValue.length; s++) {
+                      bb = {
+                        ...list[i],
+                        ...goods[a],
+                        ...goods[a].specsValue[s],
+                      };
+                      totalList.push(bb);
+                    }
+                  } else {
                     bb = {
                       ...list[i],
                       ...goods[a],
-                      ...goods[a].specsValue[s],
                     };
                     totalList.push(bb);
                   }
-                } else {
-                  bb = {
-                    ...list[i],
-                    ...goods[a],
-                  };
-                  totalList.push(bb);
                 }
               }
             }
+            this.spuList = totalList;
+            this.total = response.data.total;
+            this.loading = false;
           }
-
-          this.spuList = totalList;
-          // for (let index = 0; index < this.spuList.length; index++) {
-          //   for (let a = 0; a < this.selectList.length; a++) {
-          //     if (this.spuList[index].id == this.selectList[a]) {
-          //       console.log("cxzczxczxczx", this.spuList[index]);
-          //       this.$refs.multipleTable.toggleRowSelection(this.spuList[index], true);
-          //     }
-          //   }
-          // }
-          this.total = response.data.total;
-          this.loading = false;
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+        }
+      );
     },
 
     // 取消按钮