Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac2b1b3d10 | ||
|
|
cba8253f32 | ||
|
|
7a7cf54dc7 | ||
|
|
000b73c476 | ||
|
|
d371d016f7 | ||
|
|
64ace657ac | ||
|
|
245a04aedc | ||
|
|
33ac3cf2e6 | ||
|
|
73de49527d |
No files matched your search
@@ -12,7 +12,7 @@ export function getActivityListBySpuId(spuId) {
|
||||
// 获得多个商品,近期参与的每个活动
|
||||
export function getActivityListBySpuIds(spuIds) {
|
||||
return request.get("app-api/promotion/activity/list-by-spu-ids", {
|
||||
spuIds
|
||||
spuIds: spuIds && spuIds.length > 0 ? spuIds.join(',') : undefined
|
||||
}, {
|
||||
noAuth: true // TODO 芋艿:后续要做调整
|
||||
});
|
||||
|
||||
@@ -340,7 +340,7 @@
|
||||
qrcodeSize: 600, // 二维码的大小
|
||||
promotionCode: '', // 二维码图片
|
||||
imgTop: '', // 商品图片的 base64 码
|
||||
errT: '', // 获得小程序码失败的提示文本
|
||||
errT: '获取海报失败', // 获得小程序码失败的提示文本
|
||||
posters: false, // 分享弹窗的开关
|
||||
weixinStatus: false, // 微信分享是否打开
|
||||
canvasStatus: false, // 是否显示海报
|
||||
@@ -854,7 +854,7 @@
|
||||
let data = {
|
||||
pid: this.uid,
|
||||
id: this.id,
|
||||
path: 'pages/activity/goods_seckill_details/index'
|
||||
path: 'pages/activity/goods_combination_details/index'
|
||||
}
|
||||
getQrcode(data).then(res=>{
|
||||
base64src(res.data.code, res => {
|
||||
|
||||
@@ -42,8 +42,10 @@
|
||||
import * as PayChannelApi from '@/api/pay/channel.js';
|
||||
import * as WalletApi from '@/api/pay/wallet.js';
|
||||
import {fen2yuan} from "../../../utils/util";
|
||||
import { mapGetters } from "vuex";
|
||||
export default {
|
||||
components: {
|
||||
computed: mapGetters([ 'openid' ]),
|
||||
components: {
|
||||
CountDown,
|
||||
numberScroll
|
||||
},
|
||||
@@ -165,7 +167,8 @@
|
||||
returnUrl: this.getPayReturnUrl(),
|
||||
channelExtras: { // TODO 芋艿:等登录接入完成,需要改成动态读取
|
||||
// openid: "ockUAwIZ-0OeMZl9ogcZ4ILrGba0" // wx_pub 微信公众号支付的 openid
|
||||
openid: "oLefc4g5GjKWHJjLjMSXB3wX0fD0" // wx_lite 微信小程序支付的 openid
|
||||
// openid: "oLefc4g5GjKWHJjLjMSXB3wX0fD0" // wx_lite 微信小程序支付的 openid
|
||||
openid: this.openid
|
||||
}
|
||||
}).then(res => {
|
||||
this.handleSubmitOrderResult(res.data);
|
||||
|
||||
@@ -869,11 +869,11 @@
|
||||
});
|
||||
} else if (activity.type === 2) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/activity/goods_bargain_details/index?id=${this.id}&startBargainUid=${this.uid}`
|
||||
url: `/pages/activity/goods_bargain_details/index?id=${activity.id}&startBargainUid=${this.uid}`
|
||||
});
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: `/pages/activity/goods_combination_details/index?id=${this.id}`
|
||||
url: `/pages/activity/goods_combination_details/index?id=${activity.id}`
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
<view class='picTxt acea-row row-middle'>
|
||||
<!-- 状态图 -->
|
||||
<view class='pictrue'>
|
||||
<image v-if="orderInfo.status === 0" src="@/static/images/order/status_0.gif" />
|
||||
<image v-if="orderInfo.status === 10" src="@/static/images/order/status_10.gif" />
|
||||
<image v-if="orderInfo.status === 20" src="@/static/images/order/status_20.gif" />
|
||||
<image v-if="orderInfo.status === 30 && !orderInfo.commentStatus" src="@/static/images/order/status_30a.gif" />
|
||||
<image v-if="orderInfo.status === 30 && orderInfo.commentStatus" src="@/static/images/order/status_30b.gif" />
|
||||
<image v-if="orderInfo.status === 40" src="@/static/images/order/status_40.gif" />
|
||||
<image v-if="orderInfo.status === 0" src="http://test.yudao.iocoder.cn/order/status_0.gif" />
|
||||
<image v-if="orderInfo.status === 10" src="http://test.yudao.iocoder.cn/order/status_10.gif" />
|
||||
<image v-if="orderInfo.status === 20" src="http://test.yudao.iocoder.cn/order/status_20.gif" />
|
||||
<image v-if="orderInfo.status === 30 && !orderInfo.commentStatus" src="http://test.yudao.iocoder.cn/order/status_30a.gif" />
|
||||
<image v-if="orderInfo.status === 30 && orderInfo.commentStatus" src="http://test.yudao.iocoder.cn/order/status_30b.gif" />
|
||||
<image v-if="orderInfo.status === 40" src="http://test.yudao.iocoder.cn/order/status_40.gif" />
|
||||
</view>
|
||||
<view class='data'>
|
||||
<!-- 状态提示 -->
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
<block v-for="(item,index) in menus" :key="index">
|
||||
<navigator class="item" :url="item.url" hover-class="none"
|
||||
v-if="!(item.url ==='/pages/service/index'
|
||||
|| (item.url === '/pages/users/user_spread_user/index' && brokerageUser && brokerageUser.enabled))">
|
||||
|| (item.url === '/pages/users/user_spread_user/index' && brokerageUser && !brokerageUser.brokerageEnabled))">
|
||||
<image :src="item.picUrl"></image>
|
||||
<text>{{ item.name }}</text>
|
||||
</navigator>
|
||||
|
||||
@@ -399,8 +399,8 @@
|
||||
getCouponList: function() {
|
||||
CouponApi.getMatchCouponList({
|
||||
price: this.orderInfoVo.price.payPrice,
|
||||
spuIds: this.orderInfoVo.items.map(item => item.spuId),
|
||||
skuIds: this.orderInfoVo.items.map(item => item.skuId),
|
||||
spuIds: this.orderInfoVo.items.map(item => item.spuId).join(","),
|
||||
skuIds: this.orderInfoVo.items.map(item => item.skuId).join(","),
|
||||
categoryIds: this.orderInfoVo.items.map(item => item.categoryId)
|
||||
}).then(res => {
|
||||
this.$set(this.coupon, 'list', res.data);
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
<view class='picTxt acea-row row-middle'>
|
||||
<!-- 状态图 -->
|
||||
<view class='pictrue'>
|
||||
<image v-if="afterSale.status === 10" src="@/static/images/order/status_0.gif" />
|
||||
<image v-if="afterSale.status === 20" src="@/static/images/order/status_10.gif" />
|
||||
<image v-if="afterSale.status === 30" src="@/static/images/order/status_20.gif" />
|
||||
<image v-if="afterSale.status === 40" src="@/static/images/order/status_30a.gif" />
|
||||
<image v-if="afterSale.status === 50" src="@/static/images/order/status_30b.gif" />
|
||||
<image v-if="afterSale.status === 61" src="@/static/images/order/status_40.gif" />
|
||||
<image v-if="afterSale.status === 62" src="@/static/images/order/status_40.gif" />
|
||||
<image v-if="afterSale.status === 63" src="@/static/images/order/status_40.gif" />
|
||||
<image v-if="afterSale.status === 10" src="http://test.yudao.iocoder.cn/order/status_0.gif" />
|
||||
<image v-if="afterSale.status === 20" src="http://test.yudao.iocoder.cn/order/status_10.gif" />
|
||||
<image v-if="afterSale.status === 30" src="http://test.yudao.iocoder.cn/order/status_20.gif" />
|
||||
<image v-if="afterSale.status === 40" src="http://test.yudao.iocoder.cn/order/status_30a.gif" />
|
||||
<image v-if="afterSale.status === 50" src="http://test.yudao.iocoder.cn/order/status_30b.gif" />
|
||||
<image v-if="afterSale.status === 61" src="http://test.yudao.iocoder.cn/order/status_40.gif" />
|
||||
<image v-if="afterSale.status === 62" src="http://test.yudao.iocoder.cn/order/status_40.gif" />
|
||||
<image v-if="afterSale.status === 63" src="http://test.yudao.iocoder.cn/order/status_40.gif" />
|
||||
</view>
|
||||
<view class='data'>
|
||||
<!-- 状态提示 -->
|
||||
|
||||
@@ -193,6 +193,10 @@
|
||||
this.$store.commit("LOGIN", {
|
||||
'token': data.accessToken
|
||||
});
|
||||
// 保存opendId用于支付
|
||||
this.$store.commit("OPENID", data.openId);
|
||||
// 设置当前userId
|
||||
this.$store.commit("SETUID", data.userId);
|
||||
this.getUserInfo();
|
||||
this.bindBrokerUser();
|
||||
}).catch(e => {
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 342 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 342 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 401 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 352 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 352 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 333 KiB |
@@ -8,5 +8,6 @@ export default {
|
||||
home: state => state.app.home,
|
||||
chatUrl: state => state.app.chatUrl,
|
||||
systemPlatform: state => state.app.systemPlatform,
|
||||
openid: state => state.app.openid,
|
||||
productType: state => state.app.productType
|
||||
};
|
||||
@@ -15,7 +15,7 @@ const state = {
|
||||
backgroundColor: "#fff",
|
||||
userInfo: Cache.get(USER_INFO)?JSON.parse(Cache.get(USER_INFO)):null,
|
||||
uid: Cache.get(UID) || null,
|
||||
openid: Cache.get() || null,
|
||||
openid: Cache.get(OPENID) || null,
|
||||
homeActive: false,
|
||||
chatUrl: Cache.get('chatUrl') || '',
|
||||
systemPlatform: Cache.get(PLATFORM)?Cache.get(PLATFORM):'',
|
||||
|
||||
Reference in new issue
Block a user