zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
lemon橪 2021-06-09 20:12:26 +08:00
parent 7cbb226416
commit 305f05bade
13 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App.vue
View File

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

5
config/api.js
View File

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

2
manifest.json
View File

@ -199,9 +199,7 @@
"provider" : "wx738958e0f4c894f9" "provider" : "wx738958e0f4c894f9"
}, },
"live-player-plugin" : { "live-player-plugin" : {
"version" : "1.3.0", "version" : "1.3.0",
"provider" : "wx2b03c6e691cd7370" "provider" : "wx2b03c6e691cd7370"
} }
} }

2
pages/mine/aboutUs.vue
View File

@ -18,7 +18,7 @@
<view>客服邮箱：lili@lili.com</view> <view>客服邮箱：lili@lili.com</view>
</view> </view>
<view class="bottom flex-center"> <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>CopyRight @ {{config.name}} </view>
</view> </view>
</view> </view>

6
pages/product/goods.vue
View File

@ -118,7 +118,9 @@
<!-- 拼团用户列表 --> <!-- 拼团用户列表 -->
<PromotionAssembleListLayout v-if="isGroup" @to-assemble-buy-now="toAssembleBuyNow" :res="PromotionList" /> <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-flex" @click="shutMask(4)">
<view class="card-title"> 已选 </view> <view class="card-title"> 已选 </view>
<view class="card-content"> <view class="card-content">
@ -177,7 +179,7 @@
</view> </view>
<!-- 正常结算页面 --> <!-- 正常结算页面 -->
<view class="detail-btn" v-if="!isGroup"> <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-buy to-store-btn" @click="shutMask(4, 'buy')">立即购买</view>
<view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view> <view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view>
</view> </view>

15
pages/product/product/popup/goods.vue
View File

@ -69,7 +69,8 @@
</view> </view>
<!-- 按钮 --> <!-- 按钮 -->
<view class="btns"> <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 class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
</view> </view>
</view> </view>
@ -110,7 +111,7 @@ export default {
"selectedSku", "selectedSku",
"goodsSpec", "goodsSpec",
"addr", "addr",
"pointDetail" // 积分详情 "pointDetail", // 积分详情
], ],
watch: { watch: {
buyType: { buyType: {
@ -128,6 +129,8 @@ export default {
}, },
methods: { methods: {
// 格式化金钱 1999 --> [1999,00] // 格式化金钱 1999 --> [1999,00]
formatPrice(val) { formatPrice(val) {
if (typeof val == "undefined") { if (typeof val == "undefined") {
@ -207,19 +210,16 @@ export default {
data.cartType = "BUY_NOW"; data.cartType = "BUY_NOW";
} }
API_trade.addToCart(data).then((res) => { API_trade.addToCart(data).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/order/fillorder?way=${data.cartType}&addr=${ url: `/pages/order/fillorder?way=${data.cartType}&addr=${
this.addr.id || '' this.addr.id || ""
}&parentOrder=${encodeURIComponent( }&parentOrder=${encodeURIComponent(
JSON.stringify(this.parentOrder) JSON.stringify(this.parentOrder)
)}`, )}`,
}); });
} }
}); });
} }
}, },
@ -288,8 +288,9 @@ export default {
}, },
mounted() { mounted() {
this.formatSku(this.goodsSpec); this.formatSku(this.goodsSpec);
console.log(this.goodsDetail);
}, },
}; };
</script> </script>

6
pages/tabbar/cart/cartList.vue
View File

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

11
pages/tabbar/home/template/tpl.scss
View File

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

2
pages/tabbar/home/template/tpl_flex_one.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="layout"> <div class="layout">
<div class="flex-one" @click="modelNavigateTo(res.list[0])"> <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>
</div> </div>
</template> </template>

4
pages/tabbar/home/template/tpl_flex_two.vue
View File

@ -2,12 +2,12 @@
<div class="layout"> <div class="layout">
<div class="flex-two"> <div class="flex-two">
<div class="flex-item" @click="modelNavigateTo(res.list[0])"> <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-loading slot="loading"></u-loading>
</u-image> </u-image>
</div> </div>
<div class="flex-item" @click="modelNavigateTo(res.list[1])"> <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-loading slot="loading"></u-loading>
</u-image> </u-image>
</div> </div>

6
pages/tabbar/home/template/tpl_left_one_right_two.vue
View File

@ -2,18 +2,18 @@
<template> <template>
<div class="layout"> <div class="layout">
<div class="view-height-150" @click="modelNavigateTo(res.list[0])"> <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-loading slot="loading"></u-loading>
</u-image> </u-image>
</div> </div>
<div class="view-height-150"> <div class="view-height-150">
<div class="view-height-75" @click="modelNavigateTo(res.list[1])"> <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-loading slot="loading"></u-loading>
</u-image> </u-image>
</div> </div>
<div class="view-height-75" @click="modelNavigateTo(res.list[2])"> <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-loading slot="loading"></u-loading>
</u-image> </u-image>
</div> </div>

1
pages/tabbar/home/views.vue
View File

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

4
plugins/APPUpdate/index.js
View File

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