shish 4 лет назад
Родитель
Сommit
f1e7a824ea
2 измененных файлов с 12 добавлено и 15 удалено
  1. 7 7
      mallApp/src/pages/home/recent.vue
  2. 5 8
      mallApp/src/utils/auth.js

+ 7 - 7
mallApp/src/pages/home/recent.vue

@@ -7,25 +7,25 @@
           <view class="tit"> {{item.showName}}</view>
         </view>
       </template>
-      <view v-else> 鏆傛棤鏁版嵁 </view>
+      <view v-else> 暂无数据 </view>
     </view>
     <view class="app-main app-content" v-else>
     <app-swiper :list="ad" />
     <view class="shop-wrap">
-      <view class="shop-tit">鑺卞崏瀹�</view>
-      <view>鍘﹂棬甯備腑鑺辨眹淇℃伅鏈夐檺鍏�徃锛屾垚绔嬩簬2015骞达紝鐩�墠鏃椾笅鏈夐攢鑺卞疂銆佽姳鍗夊疂鍜岃姳鎺屾煖涓変釜鍝佺墝锛屽叕鍙歌嚧鍔涗簬甯�姪鑺卞簵鏇磋交鏉鹃珮鏁堢�鐞嗚姳搴椼€�</view>
+      <view class="shop-tit">花卉宝</view>
+      <view>厦门市中花汇信息有限公司,成立于2015年,目前旗下有销花宝、花卉宝和花掌柜三个品牌,公司致力于帮助花店更轻松高效管理花店。</view>
     </view>
     <view class="list-content">
       <tui-list-view class="tui-list-view">
         <tui-list-cell :lineLeft="false" :lineRight="false" class="tui-list" >
           <view class="list-wrap">
-            <view class="list-label">钀ヤ笟鏃堕棿</view>
+            <view class="list-label">营业时间</view>
             <view class="list-val">{{ shop.openTime || '08:00-22:00' }}</view>
           </view>
         </tui-list-cell>
         <tui-list-cell @click="phoneCall" :lineLeft="false" :lineRight="false" class="tui-list" >
           <view class="list-wrap">
-            <view class="list-label">鑱旂郴鐢佃瘽</view>
+            <view class="list-label">联系电话</view>
             <view class="list-val">{{ shop.telephone || '15280215347' }}</view>
           </view>
           <view class="list-icon">
@@ -34,8 +34,8 @@
         </tui-list-cell>
         <tui-list-cell @click="goNavBtn" :lineLeft="false" :lineRight="false" class="tui-list" >
           <view class="list-wrap">
-            <view class="list-label">鍏�徃鍦板潃</view>
-            <view class="list-val">鍘﹂棬甯傝蒋浠跺洯浜屾湡澶滃厜姹�2鍙锋ゼ521瀹�</view>
+            <view class="list-label">公司地址</view>
+            <view class="list-val">厦门市软件园二期夜光汇2号楼521室</view>
           </view>
           <view class="list-icon">
             <i class="iconfont icondianhua" style="font-size:36upx;" ></i>

+ 5 - 8
mallApp/src/utils/auth.js

@@ -2,11 +2,8 @@ import store from '@/store'
 import UTIL from '@/utils/util'
 import { getStaffApi, getUserApi } from '@/api/common'
 import { postWxCode } from '@/api/mini'
-import util from './util'
-/**
- * 获取商城端用户信息
- * @parmas update为true时会重新触发请求,重置vuex的数据
- */
+
+//获取商城端用户信息
 export async function getShopUser(update) {
 	
 }
@@ -36,7 +33,7 @@ export async function getUser(update) {
  */
 export async function getSelfInfo(update) {
 	let userInfo = store.getters.getSelfUser
-	if (!util.isEmpty(userInfo) && !update) {
+	if (!UTIL.isEmpty(userInfo) && !update) {
 		return userInfo
 	}
 	await getStaffApi().then(res => {
@@ -56,7 +53,7 @@ export async function getSelfInfo(update) {
 export async function wxLoginFn(update) {
 	let dataInfo = null
 	let loginInfo = store.state.login.loginInfo
-	if (!util.isEmpty(loginInfo) && !update) {
+	if (!UTIL.isEmpty(loginInfo) && !update) {
 		return loginInfo
 	}
 
@@ -76,7 +73,7 @@ export async function wxLoginFn(update) {
 			uni.setStorageSync('token', subRes.data.token)
 			uni.setStorageSync('miniOpenId', subRes.data.miniOpenId)
 
-			if(subRes.data.user && !$util.isEmpty(subRes.data.user)){
+			if(subRes.data.user && !UTIL.isEmpty(subRes.data.user)){
 				store.commit('setLoginInfo', subRes.data.user)
 			}