diff --git a/App.vue b/App.vue index 2530095..ab1f660 100644 --- a/App.vue +++ b/App.vue @@ -51,7 +51,8 @@ export default { onLaunch: function () { // #ifdef APP-PLUS this.checkArguments(); // 检测启动参数 - APPUpdate(); + APPUpdate(); + // 重点是以下： 一定要监听后台恢复 ！一定要 plus.globalEvent.addEventListener("newintent", (e) => { this.checkArguments(); // 检测启动参数 diff --git a/config/api.js b/config/api.js index 5932087..e66b463 100644 --- a/config/api.js +++ b/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 diff --git a/manifest.json b/manifest.json index 5e89413..0ad0eec 100644 --- a/manifest.json +++ b/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" : { diff --git a/pages/mine/aboutUs.vue b/pages/mine/aboutUs.vue index 9d53fc0..67daa12 100644 --- a/pages/mine/aboutUs.vue +++ b/pages/mine/aboutUs.vue @@ -18,7 +18,7 @@ 客服邮箱：lili@lili.com - 《lili商城用户协议》 + 《lili商城用户协议》 CopyRight @ {{config.name}} diff --git a/pages/product/goods.vue b/pages/product/goods.vue index cc4ddf2..80ac6bb 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -118,7 +118,9 @@ - + + + 已选 @@ -177,7 +179,7 @@ - 加入购物车 + 加入购物车 立即购买 暂未开始 diff --git a/pages/product/product/popup/goods.vue b/pages/product/product/popup/goods.vue index f2abb4b..6dae512 100644 --- a/pages/product/product/popup/goods.vue +++ b/pages/product/product/popup/goods.vue @@ -11,14 +11,14 @@ - + ￥ - {{ formatPrice(goodsDetail.promotionPrice)[0] }} + {{ formatPrice(goodsDetail.promotionPrice)[0] }} .{{ formatPrice(goodsDetail.promotionPrice)[1] }} - + - {{ pointDetail.points }} + {{ pointDetail.points }} 积分
@@ -27,18 +27,18 @@ formatPrice(goodsDetail.price)[0] }} .{{ formatPrice(goodsDetail.price)[1] }} - +
- ￥ - {{ + ￥ + {{ formatPrice(goodsDetail.price)[0] }} - .{{ formatPrice(goodsDetail.price)[1] }} - + .{{ formatPrice(goodsDetail.price)[1] }} + @@ -69,7 +69,8 @@ - 加入购物车 + + 加入购物车 立即购买 @@ -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); }, }; diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue index 83b744a..a02abea 100644 --- a/pages/tabbar/cart/cartList.vue +++ b/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(); } diff --git a/pages/tabbar/home/template/tpl.scss b/pages/tabbar/home/template/tpl.scss index cdad53a..a9702fb 100644 --- a/pages/tabbar/home/template/tpl.scss +++ b/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; } + diff --git a/pages/tabbar/home/template/tpl_flex_one.vue b/pages/tabbar/home/template/tpl_flex_one.vue index 752f459..9af2c5c 100644 --- a/pages/tabbar/home/template/tpl_flex_one.vue +++ b/pages/tabbar/home/template/tpl_flex_one.vue @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@ import { modelNavigateTo } from "./tpl"; export default { - title:"单行图片模块", + title: "单行图片模块", data() { return { modelNavigateTo, diff --git a/pages/tabbar/home/template/tpl_flex_two.vue b/pages/tabbar/home/template/tpl_flex_two.vue index 3574643..05c052e 100644 --- a/pages/tabbar/home/template/tpl_flex_two.vue +++ b/pages/tabbar/home/template/tpl_flex_two.vue @@ -2,12 +2,12 @@
- +
- +
diff --git a/pages/tabbar/home/template/tpl_left_one_right_two.vue b/pages/tabbar/home/template/tpl_left_one_right_two.vue index 91404b9..af8e6da 100644 --- a/pages/tabbar/home/template/tpl_left_one_right_two.vue +++ b/pages/tabbar/home/template/tpl_left_one_right_two.vue @@ -2,18 +2,18 @@