Merge branch 'ma'
# Conflicts: # pages/product/goods.vue # pages/product/product/shop/-shop.vue # pages/product/product/style.scssmaster
mabo
commit
60a8fe7361
|
|
@ -7,10 +7,14 @@ const dev = {
|
||||||
// common: "http://192.168.0.100:8890",
|
// common: "http://192.168.0.100:8890",
|
||||||
// buyer: "http://192.168.0.100:8888",
|
// buyer: "http://192.168.0.100: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",
|
||||||
|
// common: 'http://192.168.0.109:8890',
|
||||||
|
// buyer: 'http://192.168.0.109:8888',
|
||||||
};
|
};
|
||||||
// 生产环境
|
// 生产环境
|
||||||
const prod = {
|
const prod = {
|
||||||
|
// 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",
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -14,28 +14,29 @@
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
},
|
},
|
||||||
onLoad () {
|
onLoad (e) {
|
||||||
|
const params = JSON.parse((decodeURIComponent(e.params)))
|
||||||
chat.init({
|
chat.init({
|
||||||
sign: '4a971f4f4ff9637cd9286a0197b0573bf2f65de052c21791f90d4235fca41456e1cc145075567f5f47b8e13c895f3fc8cacec5789f9afee8df670f7cbe5c0f82', //必传，公司渠道唯一标识，腾讯云智服后台系统创建「小程序插件」渠道后，在「渠道管理」获取
|
sign: params.mpSign, //必传，公司渠道唯一标识，腾讯云智服后台系统创建「小程序插件」渠道后，在「渠道管理」获取
|
||||||
token: '', //非必填
|
token: params.token, //非必填
|
||||||
uid: '', //用户唯一标识，如果没有则不填写，默认为空
|
uid: params.uuid, //用户唯一标识，如果没有则不填写，默认为空
|
||||||
title: 'lilishop自营店', //非必填，如果未填写，默认获取配置标题
|
title: params.storageName, //非必填，如果未填写，默认获取配置标题
|
||||||
isRMB: '', //商品是否显示人民币￥,默认显示，false不显示
|
isRMB: '', //商品是否显示人民币￥,默认显示，false不显示
|
||||||
data: { //参数c1,c2,c3,c4,c5用于传递用户信息，参数d1,d2,d3,d4,d5,d6用于传递商品信息，默认为空
|
data: { //参数c1,c2,c3,c4,c5用于传递用户信息，参数d1,d2,d3,d4,d5,d6用于传递商品信息，默认为空
|
||||||
c1: '1',
|
c1: '',
|
||||||
c2: '2',
|
c2: '',
|
||||||
c3: '3',
|
c3: '',
|
||||||
c4: '4',
|
c4: '',
|
||||||
c5: '5',
|
c5: '',
|
||||||
d1: '这是描述', //商品描述
|
d1: params.goodsName, //商品描述
|
||||||
d2: '122.00', //价格
|
d2: params.price, //价格
|
||||||
d3: '150.00', //原价格
|
d3: '', //原价格
|
||||||
d4: '', //展示商品图片链接
|
d4: params.goodsImg, //展示商品图片链接
|
||||||
d5: '', //商品跳转链接
|
d5: '', //商品跳转链接
|
||||||
d6: '', //商品id
|
d6: params.goodsId, //商品id
|
||||||
data: ''//加密串,非必填
|
data: ''//加密串,非必填
|
||||||
},
|
},
|
||||||
viewUrl(res){ //需要跳转的链接，则需要配置一个web-view
|
viewUrl(res){ //需要跳转外部链接，则需要配置一个web-view
|
||||||
if (res) {
|
if (res) {
|
||||||
wx.navigateTo({
|
wx.navigateTo({
|
||||||
url: '/pages/webview/index?href=' + res
|
url: '/pages/webview/index?href=' + res
|
||||||
|
|
|
||||||
|
|
@ -126,16 +126,16 @@
|
||||||
<span v-if="selectedGoods.spec">{{ selectedGoods.spec.specName }}-{{
|
<span v-if="selectedGoods.spec">{{ selectedGoods.spec.specName }}-{{
|
||||||
selectedGoods.spec.specValue
|
selectedGoods.spec.specValue
|
||||||
}}</span>
|
}}</span>
|
||||||
<span v-else>默认</span>
|
<span v-else>默认</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-bottom">
|
<view class="card-bottom">
|
||||||
<u-icon name="more-dot-fill"></u-icon>
|
<u-icon name="more-dot-fill"></u-icon>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-flex" @click="shutMask(3)">
|
<view class="card-flex" @click="shutMask(3)">
|
||||||
<view class="card-title"> 送至 </view>
|
<view class="card-title"> 送至 </view>
|
||||||
<view class="card-content">
|
<view class="card-content">
|
||||||
<span v-if="delivery">{{
|
<span v-if="delivery">{{
|
||||||
delivery.consigneeAddressPath | clearStrComma
|
delivery.consigneeAddressPath | clearStrComma
|
||||||
}}</span>
|
}}</span>
|
||||||
<span v-else>暂无地址信息</span>
|
<span v-else>暂无地址信息</span>
|
||||||
|
|
@ -878,10 +878,10 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
// #ifdef MP-WEIXIN
|
// #ifdef MP-WEIXIN
|
||||||
@import "./product/mp-goods.scss";
|
@import "./product/mp-goods.scss";
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
@import "./product/style.scss";
|
@import "./product/style.scss";
|
||||||
@import "./product/product.scss";
|
@import "./product/product.scss";
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,16 @@ export default {
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
|
.desc {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #999;
|
||||||
|
margin-left: 10px;
|
||||||
|
text{
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.to-store-btn {
|
.to-store-btn {
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,19 @@ page {
|
||||||
> .headerList {
|
> .headerList {
|
||||||
flex: 8;
|
flex: 8;
|
||||||
}
|
}
|
||||||
|
> div:nth-child(2) {
|
||||||
|
flex: 1;
|
||||||
|
.headerList{
|
||||||
|
display: flex;
|
||||||
|
div{
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
> div:nth-child(3) {
|
||||||
|
width: 100rpx;
|
||||||
|
}
|
||||||
|
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue