Merge remote-tracking branch 'origin/master'

ghsApp/src/admin/home/order.vue

@@ -45,7 +45,7 @@
           "
         >
           <view class="order-top_box">
-            <app-avatar-module :src="item.customAvatar" :width="50" />
+            <app-avatar-module :src="item.customAvatarUrl" :width="38" />
             <view class="tit">
               {{ item.customName || "未命名" }}
             </view>
@@ -64,16 +64,20 @@
           </view>
           <view class="order-list_info">
             <view class="order-info_box">
-              <view>日期：</view>
-              <view>{{ item.addTime }}</view>
+              <view>编号：</view>
+              <view>{{ item.sendNum }}</view>
             </view>
             <view class="order-info_box">
               <view>单号：</view>
               <view>{{ item.orderSn }}</view>
             </view>
             <view class="order-info_box">
-              <view>人员：</view>
-              <view>{{ item.adminName }}</view>
+              <view>日期：</view>
+              <view>{{ item.addTime }}</view>
+            </view>
+            <view class="order-info_box">
+              <view>开单：</view>
+              <view>{{ item.shopAdminName }}</view>
             </view>
             <view class="order-info_box">
               <view>数量：</view>
@@ -192,7 +196,7 @@ export default {
           id: 3,
         },
         {
-          name: "已完结",
+          name: "已完成",
           value: 0,
           id: 6,
         },
@@ -529,9 +533,9 @@ export default {
   padding: 20px 30px 20px;
   & > .tit {
     color: #333333;
-    font-size: 32px;
-    font-weight: 600;
-    margin-left: 20px;
+    font-size: 30rpx;
+    font-weight: 650;
+    margin-left: 15rpx;
   }
   & > .status {
     flex: 1;

mallApp/src/api/user/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const recentShop = data => {
+	return https.get('/user/recent-shop', data)
+}

mallApp/src/pages.json

@@ -1,5 +1,11 @@
 {
 	"pages": [
+		{
+			"path": "pages/home/recent",
+			"style": {
+				"navigationBarTitleText": "最近访问的店铺"
+			}
+		},
 		{
 			"path": "pages/home/index",
 			"style": {

mallApp/src/pages/home/recent.vue

@@ -0,0 +1,95 @@
+<template>
+  <view class="latest-content_box">
+      <view class="shop-list_box">
+          <template v-if="!$util.isEmpty(list)">
+          <view 
+            :key="item.shopId"
+            @click="pageTo({
+              url: '/pages/home/index?account='+item.shopId,
+              type:4
+            })"
+            v-for="item in list">
+            <app-avatar-module :src="item.shopImg" />
+            <view class="tit">
+              {{item.shopName}}
+            </view>
+          </view>
+          </template>
+          <div v-else>
+            暂无数据
+          </div>
+      </view>
+  </view>
+</template>
+
+<script>
+import { recentShop } from "@/api/user";
+import { share } from "@/mixins";
+import AppAvatarModule from "@/components/module/app-avatar";
+import {mapGetters} from 'vuex'
+export default {
+  name: "recent",
+  components: {AppAvatarModule},
+  mixins: [share],
+  data() {
+    return {
+      list:[]
+    };
+  },
+  computed: {
+		...mapGetters({ userInfo: "getUser" })
+	},
+  onLoad() {
+
+  },
+  methods: {
+    async init(){
+         console.log(111111111111)
+        try {
+          const { data } = await recentShop({})
+          this.list = data
+        } catch(e){
+        }   
+      }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+  .shop-title_box {
+    color: #333333;
+    font-size: 30upx;
+    font-weight: 600;
+    padding: 48upx 0 80upx 40upx;
+  }
+  .shop-list_box {
+    padding:0 60upx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    & > view {
+      width: 120upx;
+      margin-bottom: 70upx;
+      & .tit {
+        text-align: center;
+        margin-top: 30upx;
+      }
+    }
+  }
+  .app-footer {
+     font-size: 28upx;
+    & .des {
+      &  > text {
+        color: #3385FF;
+        display: inline-block;
+        margin-left: 3upx;
+      }
+      & .iconfont {
+        color: #3385FF;
+        font-size: 22upx;
+        margin-left: 2upx;
+      }
+    }
+  }
+</style>