更改楼层装修适配 修改一些样式

App.vue

@@ -51,7 +51,8 @@ export default {
   onLaunch: function () {
     // #ifdef APP-PLUS
     this.checkArguments(); // 检测启动参数
-    APPUpdate();
+    APPUpdate();
+	
     // 重点是以下： 一定要监听后台恢复 ！一定要
     plus.globalEvent.addEventListener("newintent", (e) => {
       this.checkArguments(); // 检测启动参数

config/api.js

@@ -4,6 +4,8 @@
  */
 // 开发环境
 const dev = {
+  // common: 'http://192.168.0.109:8890',
+  // buyer: 'http://192.168.0.109:8888',
   common: "https://common-api.pickmall.cn",
   buyer: "https://buyer-api.pickmall.cn",
 };
@@ -11,7 +13,6 @@ const dev = {
 const prod = {
   common: "https://common-api.pickmall.cn",
   buyer: "https://buyer-api.pickmall.cn",
- 
 };
 
 //默认生产环境
@@ -22,7 +23,7 @@ if (process.env.NODE_ENV == "development") {
 } else {
   api = prod;
 }
-//微信小程序，app的打包方式只能是生产环境，所以这块直接条件编译赋值
+//微信小程序，app的打包方式建议为生产环境，所以这块直接条件编译赋值
 // #ifdef MP-WEIXIN || APP-PLUS
 api = prod;
 // #endif

manifest.json

@@ -193,18 +193,16 @@
                 "desc" : "位置信息将用于高德地图的效果展示"
             }
         },
-		"plugins" : {
-			"myPlugin" : {
-				"version" : "1.1.0",
-				"provider" : "wx738958e0f4c894f9"
-			},
-            "live-player-plugin": {
-              
-                "version": "1.3.0", 
-                
-                "provider": "wx2b03c6e691cd7370" 
+        "plugins" : {
+            "myPlugin" : {
+                "version" : "1.1.0",
+                "provider" : "wx738958e0f4c894f9"
+            },
+            "live-player-plugin" : {
+                "version" : "1.3.0",
+                "provider" : "wx2b03c6e691cd7370"
             }
-		}
+        }
     },
     "h5" : {
         "devServer" : {

pages/mine/aboutUs.vue

@@ -18,7 +18,7 @@
       <view>客服邮箱：lili@lili.com</view>
     </view>
     <view class="bottom flex-center">
-      <view @click="navigateTo('/pages/help/tips?type=user')">《lili商城用户协议》</view>
+      <view @click="navigateTo('/pages/mine/help/tips?type=user')">《lili商城用户协议》</view>
       <view>CopyRight @ {{config.name}} </view>
     </view>
   </view>

pages/product/goods.vue

@@ -118,7 +118,9 @@
           <!-- 拼团用户列表 -->
           <PromotionAssembleListLayout v-if="isGroup" @to-assemble-buy-now="toAssembleBuyNow" :res="PromotionList" />
 
-          <view class="card-box">
+
+          <!-- 配置地址 如果是虚拟产品的时候不展示 -->
+          <view class="card-box" v-if="goodsDetail.goodsType !='VIRTUAL_GOODS'">
             <view class="card-flex" @click="shutMask(4)">
               <view class="card-title"> 已选 </view>
               <view class="card-content">
@@ -177,7 +179,7 @@
         </view>
         <!-- 正常结算页面 -->
         <view class="detail-btn" v-if="!isGroup">
-          <view class="to-store-car to-store-btn" @click="shutMask(4)">加入购物车</view>
+          <view class="to-store-car to-store-btn" v-if="goodsDetail.goodsType!='VIRTUAL_GOODS'"  @click="shutMask(4)">加入购物车</view>
           <view class="to-buy to-store-btn" @click="shutMask(4, 'buy')">立即购买</view>
           <view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view>
         </view>

pages/product/product/popup/goods.vue

@@ -11,14 +11,14 @@
 
             <!-- 有活动商品价格 -->
             <view class="goods-price " v-if="goodsDetail.promotionPrice">
-              <span v-if="goodsDetail.promotionPrice && !pointDetail"> 
+              <span v-if="goodsDetail.promotionPrice && !pointDetail">
                 ￥
-                <span class="goods-price-promotionShow goods-price-bigshow" >{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
                 .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
               </span>
-              <span v-if="pointDetail.points"> 
+              <span v-if="pointDetail.points">
 
-                <span class="goods-price-promotionShow goods-price-bigshow" >{{ pointDetail.points }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow">{{ pointDetail.points }}</span>
                 积分
               </span>
               <div class="promotion-box">
@@ -27,18 +27,18 @@
                 formatPrice(goodsDetail.price)[0]
               }}</span>
                 .{{ formatPrice(goodsDetail.price)[1] }}
-              
+
               </div>
             </view>
             <!-- 正常商品的价格 -->
             <view class="goods-price" v-else>
               <span>
-              ￥
-              <span class="goods-price-bigshow">{{
+                ￥
+                <span class="goods-price-bigshow">{{
                 formatPrice(goodsDetail.price)[0]
               }}</span>
-              .{{ formatPrice(goodsDetail.price)[1] }}
-            
+                .{{ formatPrice(goodsDetail.price)[1] }}
+
               </span>
             </view>
             <view class="goods-check-skus">
@@ -69,7 +69,8 @@
         </view>
         <!-- 按钮 -->
         <view class="btns">
-          <view class="box-btn card" v-if="buyType !='PINTUAN'" @click="addToCartOrBuy('cart')">加入购物车</view>
+
+          <view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType!='VIRTUAL_GOODS'" @click="addToCartOrBuy('cart')">加入购物车</view>
           <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
         </view>
       </view>
@@ -100,8 +101,8 @@ export default {
       formatList: [],
       currentSelceted: [],
       skuList: "",
-      isMask:false, //是否显示遮罩层
-      isClose:false, //是否可以点击遮罩关闭
+      isMask: false, //是否显示遮罩层
+      isClose: false, //是否可以点击遮罩关闭
     };
   },
   props: [
@@ -110,7 +111,7 @@ export default {
     "selectedSku",
     "goodsSpec",
     "addr",
-    "pointDetail" // 积分详情
+    "pointDetail", // 积分详情
   ],
   watch: {
     buyType: {
@@ -128,6 +129,8 @@ export default {
   },
 
   methods: {
+  
+
     // 格式化金钱  1999 --> [1999,00]
     formatPrice(val) {
       if (typeof val == "undefined") {
@@ -168,7 +171,7 @@ export default {
       };
       this.selectName = specValue.value;
 
-      this.$emit("handleClickSku", selectedSkuId.skuId,this.goodsDetail.id);
+      this.$emit("handleClickSku", selectedSkuId.skuId, this.goodsDetail.id);
     },
 
     /**
@@ -207,19 +210,16 @@ export default {
           data.cartType = "BUY_NOW";
         }
 
-       
-
         API_trade.addToCart(data).then((res) => {
           if (res.data.code == 200) {
             uni.navigateTo({
               url: `/pages/order/fillorder?way=${data.cartType}&addr=${
-                this.addr.id || ''
+                this.addr.id || ""
               }&parentOrder=${encodeURIComponent(
                 JSON.stringify(this.parentOrder)
               )}`,
             });
           }
-        
         });
       }
     },
@@ -288,8 +288,9 @@ export default {
   },
 
   mounted() {
-   
     this.formatSku(this.goodsSpec);
+
+    console.log(this.goodsDetail);
   },
 };
 </script>

pages/tabbar/cart/cartList.vue

@@ -473,7 +473,7 @@ export default {
     getCardData() {
       if (this.$options.filters.isLogin("auth")) {
         uni.showLoading({
-          mask: true,
+          title: "加载中",
         });
         API_Trade.getCarts()
           .then((result) => {
@@ -498,12 +498,10 @@ export default {
                   });
               }
               uni.stopPullDownRefresh();
-              uni.hideLoading();
             }
           })
-          .catch((err) => {
-            uni.hideLoading();
-          });
+          .catch((err) => {});
+        uni.hideLoading();
       } else {
         uni.hideLoading();
       }

pages/tabbar/home/template/tpl.scss

@@ -1,8 +1,8 @@
 .image-mode {
-    max-width: 100%;
-    height: auto;
+   width: 100%;
+   height: 100%;
     display: block;
-  
+    padding: 2rpx;
 }
 .layout {
     padding: 16rpx;
@@ -18,10 +18,10 @@
     width: 100%;
 }
 .view-height-75 {
-    height: 150rpx;
+    // height: 150rpx;
 }
 .view-height-150 {
-    height: 300rpx;
+    // height: 300rpx;
     flex: 1;
 }
 
@@ -29,3 +29,4 @@
     height: 170rpx;
     flex: 1;
 }
+

pages/tabbar/home/template/tpl_flex_one.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="layout">
     <div class="flex-one" @click="modelNavigateTo(res.list[0])">
-      <u-image  width="100%" height="280rpx" :src="res.list[0].img" alt=""></u-image>
+      <u-image width="100%" mode="aspectFit" height="280rpx" :src="res.list[0].img" alt=""></u-image>
     </div>
   </div>
 </template>
@@ -9,7 +9,7 @@
 import { modelNavigateTo } from "./tpl";
 
 export default {
-  title:"单行图片模块",
+  title: "单行图片模块",
   data() {
     return {
       modelNavigateTo,

pages/tabbar/home/template/tpl_flex_two.vue

@@ -2,12 +2,12 @@
   <div class="layout">
     <div class="flex-two">
       <div class="flex-item" @click="modelNavigateTo(res.list[0])">
-        <u-image height="325rpx" width="100%" mode="scaleToFill" :src="res.list[0].img" alt>
+        <u-image height="250rpx" width="100%" mode="scaleToFill" :src="res.list[0].img" alt>
           <u-loading slot="loading"></u-loading>
         </u-image>
       </div>
       <div class="flex-item" @click="modelNavigateTo(res.list[1])">
-        <u-image height="325rpx" width="100%" mode="scaleToFill" :src="res.list[1].img" alt>
+        <u-image height="250rpx" width="100%" mode="scaleToFill" :src="res.list[1].img" alt>
           <u-loading slot="loading"></u-loading>
         </u-image>
       </div>

pages/tabbar/home/template/tpl_left_one_right_two.vue

@@ -2,18 +2,18 @@
 <template>
   <div class="layout">
     <div class="view-height-150" @click="modelNavigateTo(res.list[0])">
-      <u-image width="100%" height="300rpx" class="image-mode" :src="res.list[0].img">
+      <u-image width="100%" height="340rpx" class="image-mode" :src="res.list[0].img">
         <u-loading slot="loading"></u-loading>
       </u-image>
     </div>
     <div class="view-height-150">
       <div class="view-height-75" @click="modelNavigateTo(res.list[1])">
-        <u-image width="100%" height="150rpx" class="image-mode" :src="res.list[1].img" alt>
+        <u-image width="100%" height="170rpx" class="image-mode" :src="res.list[1].img" alt>
           <u-loading slot="loading"></u-loading>
         </u-image>
       </div>
       <div class="view-height-75" @click="modelNavigateTo(res.list[2])">
-        <u-image width="100%" height="150rpx" class="image-mode" :src="res.list[2].img" alt>
+        <u-image width="100%" height="170rpx" class="image-mode" :src="res.list[2].img" alt>
           <u-loading slot="loading"></u-loading>
         </u-image>
       </div>

pages/tabbar/home/views.vue

@@ -93,6 +93,7 @@ export default {
 
   mounted() {
     this.init();
+  
   },
   methods: {
     /**

plugins/APPUpdate/index.js

@@ -2,8 +2,6 @@
 /**** 此文件说明请看注释 *****/
 // 可以用自己项目的请求方法
 // 请求配置说明：https://ext.dcloud.net.cn/plugin?id=822
-import http from '@/utils/request.js';
-/**** 结束 *****/
 import {
 	getAppVersionList
 } from '@/api/message.js'
@@ -32,7 +30,7 @@ export const getServerNo = function (callback) {
 	platform == "android" ? type = "ANDROID" : type = "IOS"
 
 	getAppVersionList(type).then(res => {
-	
+		console.log(res)
 		if(res.data.success && res.data.result.downloadUrl){
 			let response = res.data.result
 			let result ={}