新花店

mallApp/src/components/plugin/list-cell.vue

@@ -18,19 +18,19 @@ export default {
 			type: Boolean,
 			default: true
 		},
-		// left 30upx
+		// left 30rpx
 		lineLeft: {
 			type: Boolean,
 			default: true
 		},
-		// right 30upx
+		// right 30rpx
 		lineRight: {
 			type: Boolean,
 			default: true
 		},
 		padding: {
 			type: String,
-			default: '26upx 30upx'
+			default: '26rpx 30rpx'
 		},
 		last: {
 			type: Boolean,
@@ -77,7 +77,7 @@ export default {
 		align-items: center;
 	}
 	.tui-radius {
-		border-radius: 12upx;
+		border-radius: 12rpx;
 		overflow: hidden;
 	}
 
@@ -88,7 +88,7 @@ export default {
 	.tui-list-cell::after {
 		content: '';
 		position: absolute;
-		border-bottom: 2upx solid #eee;
+		border-bottom: 2px solid #eee;
 		-webkit-transform: scaleY(0.5);
 		transform: scaleY(0.5);
 		bottom: 0;
@@ -96,11 +96,11 @@ export default {
 		left: 0;
 	}
 	.tui-line-left::after {
-		left: 30upx !important;
+		left: 30rpx !important;
 	}
 
 	.tui-line-right::after {
-		right: 30upx !important;
+		right: 30rpx !important;
 	}
 
 	.tui-cell-last::after {
@@ -109,16 +109,16 @@ export default {
 
 	.tui-list-cell.tui-cell-arrow:before {
 		content: ' ';
-		height: 22upx;
-		width: 22upx;
-		border-width: 2upx 2upx 0 0;
+		height: 22px;
+		width: 22px;
+		border-width: 2px 2px 0 0;
 		border-color: #b2b2b2;
 		border-style: solid;
 		-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
 		transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
 		position: absolute;
 		top: 50%;
-		margin-top: -12upx;
-		right: 30upx;
+		margin-top: -12px;
+		right: 30rpx;
 	}
 </style>

mallApp/src/pages.json

@@ -209,7 +209,7 @@
                 "pagePath": "pages/home/recent",
                 "iconPath": "static/images/common/home-no.png",
                 "selectedIconPath": "static/images/common/home-is.png",
-                "text": "新花店"
+                "text": "花店"
             },
             {
                 "pagePath": "pages/home/user",

mallApp/src/pages/goods/detail.vue

@@ -24,18 +24,13 @@
           <span>{{ data.sold }}</span>
         </view>
         <view>
-          <template v-if="data.stock != -1">
-            <span class="prompt-text">剩余</span>
-            <span>{{ data.stock }}</span>
-          </template>
-          <template v-else></template>
+            <span class="prompt-text">品质保证</span>
         </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" /> -->
         <view class="module-det-text">
           <template v-if="$util.isEmpty(data.content) == false">
             <rich-text :nodes="data.content"></rich-text>
@@ -54,16 +49,12 @@
         </view>
       </view>
     </view>
-
     <sel-popup :show="popupShow" :info="data" :buyNum="buyNum" @change="changeNum" @close="hidePopup" />
     <buy-foot @buy="showPopup" @goShop="goToShop" :stock="data.stock" />
-
     <go-login :show.sync="loginShow" />
-
     <app-share-mask :show="showShare" text="分享商品" @click="hideShare" />
   </view>
 </template>
-
 <script>
 import AppImg from "@/components/app-img";
 import AppSwiper from "@/components/app-swiper";

mallApp/src/pages/home/index.vue

@@ -7,7 +7,6 @@
         <goods-list-small v-if="item.showRow == 2" :info="item" />
       </view>
     </template>
-    <app-trademark />
     <tab-bar :current="0"></tab-bar>
   </view>
 </template>
@@ -20,7 +19,6 @@ import goodsListMiddle from "@/pages/home/components/goods-list-middle";
 import goodsListSmall from "@/pages/home/components/goods-list-small";
 import { getMainIndex } from "@/api/home";
 import { getOrderShop } from "@/utils/config";
-import { getShopUser } from "@/utils/auth";
 import { share } from "@/mixins";
 export default {
   name: "home",

mallApp/src/pages/order/list.vue

@@ -1,60 +1,26 @@
 <template>
   <div class="app-content">
     <block v-if="!$util.isEmpty(list.data)">
-      <div
-        class="list-wrap"
-        v-for="(item, index) in list.data"
-        :key="index"
-        @click="pageTo({
-			url: '/pages/order/detail',
-			query: {
-				id: item.id
-			}
-		})"
-      >
+      <div class="list-wrap" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/pages/order/detail', query: { id: item.id } })" >
         <div class="list-top flex-center-between">
           <div class="app-color-3">编号：{{ item.sendNum }}</div>
           <div class="app-price">{{ item.status | constantfilter('ORDER_STATUS') }}</div>
         </div>
         <div class="list-blo">
           <block v-if="!$util.isEmpty(item.goodsInfoList)">
-            <list-module
-              v-for="(items, subIndex) in item.goodsInfoList"
-              :key="subIndex"
-              :info="items"
-            />
+            <list-module v-for="(items, subIndex) in item.goodsInfoList" :key="subIndex" :info="items" />
           </block>
         </div>
         <div class="list-bottom flex-center-between">
           <div>
-            <span>应付金额：</span>
-            <span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
+            <span>金额：</span>
+            <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</span>
           </div>
           <block v-if="item.status == 0">
-            <button
-              class="button-com red"
-              @click.stop="pageTo({
-						url: '/pages/callback/index',
-						query: {
-							pageStatus: 1,
-							orderSn: item.orderSn,
-							totalPrice: item.actPrice,
-							couponId: item.couponId
-						}
-					})"
-            >立即付款</button>
+            <button class="button-com red" @click.stop="pageTo({ url: '/pages/callback/index', query: { pageStatus: 1, orderSn: item.orderSn, totalPrice: item.orderPrice, couponId: item.couponId } })" >立即付款</button>
           </block>
           <block v-if="item.status == 5">
-            <button
-              v-if="data.grade == 0"
-              class="button-com red defalut"
-              @click.stop="pageTo({
-						url: '/pages/order/comment',
-						query: {
-							id: item.id
-						}
-					})"
-            >评价</button>
+            <button v-if="data.grade == 0" class="button-com red defalut" @click.stop="pageTo({ url: '/pages/order/comment', query: { id: item.id } })" >评价</button>
           </block>
         </div>
       </div>
@@ -64,7 +30,6 @@
     </block>
   </div>
 </template>
-
 <script>
 import ListModule from "@/components/module/app-order-list";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
@@ -109,7 +74,6 @@ export default {
   }
 };
 </script>
-
 <style lang="scss" scoped>
 .app-content {
   padding-top: 20upx;
@@ -129,4 +93,4 @@ export default {
     }
   }
 }
-</style>
+</style>