商城

mallApp/src/components/app-wrapper-empty.vue

@@ -3,7 +3,6 @@
 		<div class="app-empty-center" :style="{'text-align: center;': !!isEmpty}">
 			<slot v-if="!isEmpty" name="empty_body" />
 			<slot v-if="isEmpty && !isLoading" name="empty_content">
-				<!-- :style="`width:${pictureWidth};`" -->
 				<div class="app-empty__img" :style="{width: pictureWidth}">
 					<img :src="src" mode="widthFix" />
 				</div>
@@ -18,9 +17,7 @@
 			<slot v-else>
 				<div>
 					<div class="foot-layout" v-if="finished">
-						<!-- <div class='foot-divider'></div> -->
 						<div class="foot-text">{{finishedText}}</div>
-						<!-- <div class='foot-divider'></div> -->
 					</div>
 					<div class="foot-layout" v-if="isLoading">
 						<div class="foot-text">
@@ -38,11 +35,6 @@
 export default {
 	name: 'AppWrapperEmpty',
 	props: {
-		/**
-			 * type()
-			 * search (搜索)
-			 * noData (无数据)
-			 */
 		type: {
 			type: String,
 			default: 'noData'
@@ -124,9 +116,8 @@ export default {
 			text-align: center;
 			margin: 116upx auto 50upx;
 			& image {
-				width: 500upx;
-				max-width: 100%;
-				height: auto;
+				width: 160upx;
+				margin:0 auto;
 			}
 		}
 

mallApp/src/pages/goods/components/buy-foot.vue

@@ -11,8 +11,7 @@
             </div>
         </div>
         <div class="btn-right">
-            <button v-if="stock == 0" class="button-com default">已售完</button>
-            <button v-else class="button-com red" @click="buy">立即购买</button>
+            <button class="button-com red" @click="buy">立即购买</button>
         </div>
     </div>
 </template>

mallApp/src/pages/goods/detail.vue

@@ -1,85 +1,67 @@
 <template>
-  <div class="app-content">
+  <view class="app-content">
     <app-swiper :height="{type: 'number',val: 750}" :tagShow="true" :list="imgList" />
-    <!-- 商品简介 -->
-    <div class="shop-intro">
-      <div class="app-price app-bold">
+    <view class="shop-intro">
+      <view class="app-price app-bold">
         <text>￥</text>
         <text class="app-size-34">{{ data.price }}</text>
-        <!-- <text>.00</text> -->
-      </div>
-      <div class="tui-pro-titbox">
-        <div class="tui-pro-title app-size-32">{{ data.goodsName }}</div>
+      </view>
+      <view class="tui-pro-titbox">
+        <view class="tui-pro-title app-size-32">{{ data.name }}</view>
         <button open-type="share" class="tui-share-btn tui-share-position" @click="shareFn">
-          <app-tag
-            type="gray"
-            tui-tag-class="tui-tag-share tui-size"
-            shape="circleLeft"
-            size="small"
-          >
-            <div class="flex-center">
+          <app-tag type="gray" tui-tag-class="tui-tag-share tui-size" shape="circleLeft" size="small" >
+            <view class="flex-center">
               <i class="iconfont iconfenxiang"></i>
               <text class="tui-share-text tui-gray">分享</text>
-            </div>
+            </view>
           </app-tag>
         </button>
-      </div>
-      <div class="shop-express app-color-3">
-        <div>{{ data.freeSendDist }}公里内免运费</div>
-        <div>
+      </view>
+      <view class="shop-express app-color-3">
+        <view>{{ data.freeSendDist }}公里内免运费</view>
+        <view>
           <span class="prompt-text">已售</span>
           <span>{{ data.sold }}</span>
-        </div>
-        <div>
+        </view>
+        <view>
           <template v-if="data.stock != -1">
             <span class="prompt-text">剩余</span>
             <span>{{ data.stock }}</span>
           </template>
           <template v-else></template>
-        </div>
-      </div>
-    </div>
-    <!-- 商品详情 -->
-
-    <div class="module-wrap shop-detail">
-      <div class="module-tit app-size-30">商品详情</div>
-      <div class="module-det">
+        </view>
+      </view>
+    </view>
+    <view class="module-wrap shop-detail">
+      <view class="module-tit app-size-30">商品详情</view>
+      <view class="module-det">
         <!-- <app-img :src="imgNormal" alt mode="widthFix" /> -->
-        <div class="module-det-text">
+        <view class="module-det-text">
           <template v-if="$util.isEmpty(data.content) == false">
             <rich-text :nodes="data.content"></rich-text>
           </template>
           <template v-else>
             <rich-text :nodes="data.briefContent"></rich-text>
           </template>
-        </div>
-      </div>
-    </div>
-
-    <!-- 简要说明 -->
-    <div class="module-wrap shop-desc">
-      <div class="module-tit app-size-30">简要说明</div>
-      <div class="module-det">
-        <div class="module-det-text">
+        </view>
+      </view>
+    </view>
+    <view class="module-wrap shop-desc">
+      <view class="module-tit app-size-30">简要说明</view>
+      <view class="module-det">
+        <view class="module-det-text">
           <rich-text :nodes="data.commonIntro"></rich-text>
-        </div>
-      </div>
-    </div>
-    <!-- 简要说明 -->
-    <app-trademark />
-    <sel-popup
-      :show="popupShow"
-      :info="data"
-      :buyNum="buyNum"
-      @change="changeNum"
-      @close="hidePopup"
-    />
+        </view>
+      </view>
+    </view>
+
+    <sel-popup :show="popupShow" :info="data" :buyNum="buyNum" @change="changeNum" @close="hidePopup" />
     <buy-foot @buy="showPopup" @goShop="goToShop" :stock="data.stock" />
-    <!-- login -->
+
     <go-login :show.sync="loginShow" />
-    <!-- 分享 -->
+
     <app-share-mask :show="showShare" text="分享商品" @click="hideShare" />
-  </div>
+  </view>
 </template>
 
 <script>
@@ -115,7 +97,6 @@ export default {
       buyNum: 1,
       popupShow: false,
       loginShow: false,
-      // share
       showShare: false
     };
   },
@@ -167,14 +148,7 @@ export default {
     },
     goToShop(){
       let account = uni.getStorageSync('account')
-      this.$util.pageTo({
-                url: '/pages/home/shop',
-                type: 4,
-query: {
-                account: account
-              }
-
-            })
+      this.$util.pageTo({ url: '/pages/home/shop', type: 4, query: { account: account } })
     },
     showPopup() {
       if (this.$util.isLogin()) {
@@ -259,4 +233,4 @@ query: {
     }
   }
 }
-</style>
+</style>

mallApp/src/pages/home/category.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-main app-content">
-    <scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop" :style="{height:height+'px'}" >
+    <scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
       <div v-for="(item,index) in tabbar" :key="index" class="tab-bar-item" :class="[currentTab==index ? 'active' : '']" :data-current="index" @tap.stop="swichNav($event ,item)" >
         <text>{{item.categoryName}}</text>
       </div>
     </scroll-view>
     <block v-for="(item,index) in tabbar" :key="index" >
-      <scroll-view scroll-y class="right-box" :style="{height:height+'px'}" @scrolltolower="onReachBottoms" v-if="currentTab==index" >
+      <scroll-view scroll-y class="right-box" @scrolltolower="onReachBottoms" v-if="currentTab==index" >
         <div class="page-view" v-if="!$util.isEmpty(list.data)" >
           <div class="goods-list" v-for="(items) in list.data" :key="items.id" @click="pageTo(`/pages/goods/detail?id=${items.id}`)" >
             <div class="img-blo">
@@ -14,7 +14,7 @@
             </div>
             <div class="goods-det">
               <div class="goods-det-top">
-                <div class="goods-name">{{ items.goodsName }}</div>
+                <div class="goods-name">{{ items.name }}</div>
                 <div class="goods-sales">已售{{ items.sold }}</div>
               </div>
               <div class="goods-price">￥{{ items.price }}</div>
@@ -35,7 +35,6 @@ import AppWrapperEmpty from '@/components/app-wrapper-empty'
 import { getClass, getList } from '@/api/category'
 import { list } from '@/mixins'
 import { share } from "@/mixins";
-import { getShopUser } from "@/utils/auth";
 export default {
   name: 'category',
   components: {

mallApp/src/pages/home/components/goods-list-big.vue

@@ -14,7 +14,7 @@
 					</div>
 					<div class="goods-det">
 						<div class="goods-left">
-							<div class="goods-name">{{ item.goodsName }}</div>
+							<div class="goods-name">{{ item.name }}</div>
 							<div class="app-price">￥{{ item.price }}</div>
 						</div>
 						<div class="button-com red buy-com-btn">购买</div>

mallApp/src/pages/home/components/goods-list-middle.vue

@@ -13,7 +13,7 @@
 				</div>
 				<div class="goods-det">
 					<div class="goods-left">
-						<div class="goods-name">{{ item.goodsName }}</div>
+						<div class="goods-name">{{ item.name }}</div>
 						<div class="app-price">￥{{ item.price }}</div>
 					</div>
 					<div class="button-com red buy-com-btn" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">购买</div>

mallApp/src/pages/home/components/goods-list-small.vue

@@ -13,7 +13,7 @@
 				</div>
 				<div class="goods-det">
 					<div class="goods-left">
-						<div class="goods-name">{{ item.goodsName }}</div>
+						<div class="goods-name">{{ item.name }}</div>
 						<div class="app-price">￥{{ item.price }}</div>
 					</div>
 					<div class="button-com red buy-com-btn">购买</div>