支付增加订阅功能,增加海报生成传递from类型
This commit is contained in:
@ -75,8 +75,8 @@ export function getGroomList(type) {
|
|||||||
/*
|
/*
|
||||||
* 获取商品海报
|
* 获取商品海报
|
||||||
* */
|
* */
|
||||||
export function getProductPoster(id) {
|
export function getProductPoster(id, data) {
|
||||||
return request.get("/product/poster/" + id, {}, {
|
return request.get("/product/poster/" + id, data, {
|
||||||
login: true
|
login: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -29,19 +29,8 @@
|
|||||||
<view class="save-poster" @click="savePosterPath">生成图片</view>
|
<view class="save-poster" @click="savePosterPath">生成图片</view>
|
||||||
</view>-->
|
</view>-->
|
||||||
<view class="poster-pop" v-show="canvasStatus">
|
<view class="poster-pop" v-show="canvasStatus">
|
||||||
<img
|
<img src="@/static/images/poster-close.png" class="close" @click="posterImageClose" mode="widthFix" />
|
||||||
src="@/static/images/poster-close.png"
|
<image :src="posterImage" alt="tp" class="poster-image" show-menu-by-longpress mode="widthFix" />
|
||||||
class="close"
|
|
||||||
@click="posterImageClose"
|
|
||||||
mode="widthFix"
|
|
||||||
/>
|
|
||||||
<image
|
|
||||||
:src="posterImage"
|
|
||||||
alt="tp"
|
|
||||||
class="poster-image"
|
|
||||||
show-menu-by-longpress
|
|
||||||
mode="widthFix"
|
|
||||||
/>
|
|
||||||
<view class="keep">长按图片可以保存到手机</view>
|
<view class="keep">长按图片可以保存到手机</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="mask"></view>
|
<view class="mask"></view>
|
||||||
@ -50,8 +39,12 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
// import html2canvas from "html2canvas";
|
// import html2canvas from "html2canvas";
|
||||||
import { PosterCanvas } from "@/utils";
|
import {
|
||||||
import { getProductPoster } from "@/api/store";
|
PosterCanvas
|
||||||
|
} from "@/utils";
|
||||||
|
import {
|
||||||
|
getProductPoster
|
||||||
|
} from "@/api/store";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "StorePoster",
|
name: "StorePoster",
|
||||||
@ -86,8 +79,13 @@ export default {
|
|||||||
savePosterPath: function () {
|
savePosterPath: function () {
|
||||||
const that = this;
|
const that = this;
|
||||||
|
|
||||||
uni.showLoading({ title: "海报生成中", mask: true });
|
uni.showLoading({
|
||||||
getProductPoster(this.goodId)
|
title: "海报生成中",
|
||||||
|
mask: true
|
||||||
|
});
|
||||||
|
getProductPoster(this.goodId, {
|
||||||
|
from: this.$deviceType == 'weixin' || this.$deviceType == 'weixinh5' ? 'uniappH5' : this.$deviceType
|
||||||
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
this.canvasStatus = true;
|
this.canvasStatus = true;
|
||||||
this.posterImage = res.data;
|
this.posterImage = res.data;
|
||||||
@ -125,6 +123,7 @@ export default {
|
|||||||
.poster-first {
|
.poster-first {
|
||||||
overscroll-behavior: contain;
|
overscroll-behavior: contain;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop {
|
.poster-pop {
|
||||||
width: 4.5 * 100rpx;
|
width: 4.5 * 100rpx;
|
||||||
height: 8 * 100rpx;
|
height: 8 * 100rpx;
|
||||||
@ -135,46 +134,57 @@ export default {
|
|||||||
top: 50%;
|
top: 50%;
|
||||||
margin-top: -4.6 * 100rpx;
|
margin-top: -4.6 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas {
|
.poster-pop .canvas {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
height: 8 * 100rpx;
|
height: 8 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .poster-image {
|
.poster-pop .poster-image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .image {
|
.poster-pop .canvas .image {
|
||||||
width: 4.5 * 100rpx;
|
width: 4.5 * 100rpx;
|
||||||
height: 4.5 * 100rpx;
|
height: 4.5 * 100rpx;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .text {
|
.poster-pop .canvas .text {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #000000;
|
color: #000000;
|
||||||
margin-top: 0.32 * 100rpx;
|
margin-top: 0.32 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .text.black {
|
.poster-pop .canvas .text.black {
|
||||||
height: 0.68 * 100rpx;
|
height: 0.68 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .text.rad {
|
.poster-pop .canvas .text.rad {
|
||||||
color: #ff0000;
|
color: #ff0000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .code {
|
.poster-pop .canvas .code {
|
||||||
height: 1.4 * 100rpx;
|
height: 1.4 * 100rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .code .code-img {
|
.poster-pop .canvas .code .code-img {
|
||||||
width: 33%;
|
width: 33%;
|
||||||
padding: 0.06 * 100rpx;
|
padding: 0.06 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .code .code-img image {
|
.poster-pop .canvas .code .code-img image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .canvas .code .code-text {
|
.poster-pop .canvas .code .code-text {
|
||||||
width: 60%;
|
width: 60%;
|
||||||
font-size: 0.12 * 100rpx;
|
font-size: 0.12 * 100rpx;
|
||||||
line-height: 1.64 * 100rpx;
|
line-height: 1.64 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .close {
|
.poster-pop .close {
|
||||||
width: 0.46 * 100rpx;
|
width: 0.46 * 100rpx;
|
||||||
height: 0.75 * 100rpx;
|
height: 0.75 * 100rpx;
|
||||||
@ -183,6 +193,7 @@ export default {
|
|||||||
top: -0.73 * 100rpx;
|
top: -0.73 * 100rpx;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .save-poster {
|
.poster-pop .save-poster {
|
||||||
background-color: #df2d0a;
|
background-color: #df2d0a;
|
||||||
font-size: 0.22 * 100rpx;
|
font-size: 0.22 * 100rpx;
|
||||||
@ -193,12 +204,14 @@ export default {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
margin-top: -0.04 * 100rpx;
|
margin-top: -0.04 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-pop .keep {
|
.poster-pop .keep {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 0.25 * 100rpx;
|
font-size: 0.25 * 100rpx;
|
||||||
margin-top: 0.1 * 100rpx;
|
margin-top: 0.1 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mask {
|
.mask {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
@ -1,11 +1,7 @@
|
|||||||
|
|
||||||
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
|
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
|
||||||
// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
|
// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
|
||||||
<<<<<<< HEAD
|
|
||||||
export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
|
|
||||||
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
|
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
|
||||||
=======
|
|
||||||
export const VUE_APP_API_URL = 'http://h5api.xinxintuan.co/api';
|
export const VUE_APP_API_URL = 'http://h5api.xinxintuan.co/api';
|
||||||
>>>>>>> 2723cab7364b2e3e5d2ec4f2cd941461a936cb95
|
|
||||||
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
|
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ export async function payOrderHandle(orderId, type, from) {
|
|||||||
});
|
});
|
||||||
payOrder(orderId, type, from)
|
payOrder(orderId, type, from)
|
||||||
.then(async res => {
|
.then(async res => {
|
||||||
await handleOrderPayResults(res.data)
|
await handleOrderPayResults(res.data, type)
|
||||||
resolve()
|
resolve()
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
@ -98,7 +98,9 @@ export async function payOrderHandle(orderId, type, from) {
|
|||||||
|
|
||||||
// 处理调用支付接口的逻辑
|
// 处理调用支付接口的逻辑
|
||||||
// @type create(创建订单)||pay(支付订单)
|
// @type create(创建订单)||pay(支付订单)
|
||||||
export function handleOrderPayResults(data, type) {
|
export function handleOrderPayResults(data, type, payType) {
|
||||||
|
console.log(data, type, payType)
|
||||||
|
|
||||||
console.log(data, type)
|
console.log(data, type)
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
@ -156,19 +158,37 @@ export function handleOrderPayResults(data, type) {
|
|||||||
weappPay(data.result.jsConfig).finally(() => {
|
weappPay(data.result.jsConfig).finally(() => {
|
||||||
resolve()
|
resolve()
|
||||||
goOrderDetails(data.result.orderId, type)
|
goOrderDetails(data.result.orderId, type)
|
||||||
});
|
}).then(res => {
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
subscribeMessage()
|
||||||
|
// #endif
|
||||||
|
})
|
||||||
break;
|
break;
|
||||||
// APP支付
|
// APP支付
|
||||||
case "WECHAT_APP_PAY":
|
case "WECHAT_APP_PAY":
|
||||||
weappPay(data.result.jsConfig).finally(() => {
|
weappPay(data.result.jsConfig).finally(() => {
|
||||||
resolve()
|
resolve()
|
||||||
goOrderDetails(data.result.orderId, type)
|
goOrderDetails(data.result.orderId, type)
|
||||||
});
|
})
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function subscribeMessage() {
|
||||||
|
// 调用订阅
|
||||||
|
console.log('调用订阅')
|
||||||
|
uni.requestSubscribeMessage({
|
||||||
|
tmplIds: ['W5r2c2kzhbq8uxStkPAVx_sk-5aapMFCqe7b7KU5jXI', '2CB_1UyQrbnlyjJa5syraqJ3cfztPPDOAHe3DEXpMjg', 'vuztugw9VbKbKJDAAVePkjqPpT5mdoREpd4Aq7EGPRU'],
|
||||||
|
success(res) {
|
||||||
|
console.log(res)
|
||||||
|
},
|
||||||
|
fail(error){
|
||||||
|
console.log(error)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export function goOrderDetails(id, type) {
|
export function goOrderDetails(id, type) {
|
||||||
// 创建订单时跳转到详情
|
// 创建订单时跳转到详情
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import { subscribeMessage } from "@/libs/order";
|
||||||
import { getProvider } from "@/utils";
|
import { getProvider } from "@/utils";
|
||||||
import WechatJSSDK from "wechat-jssdk/dist/client.umd";
|
import WechatJSSDK from "wechat-jssdk/dist/client.umd";
|
||||||
import { getWechatConfig, wechatAuth } from "@/api/public";
|
import { getWechatConfig, wechatAuth } from "@/api/public";
|
||||||
@ -9,7 +10,6 @@ import dayjs from "dayjs";
|
|||||||
// 支付模块
|
// 支付模块
|
||||||
export const weappPay = (option) => {
|
export const weappPay = (option) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
console.log(option)
|
|
||||||
if (store.state.$deviceType == 'weixinh5') {
|
if (store.state.$deviceType == 'weixinh5') {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
location.href = option.mweb_url;
|
location.href = option.mweb_url;
|
||||||
@ -59,11 +59,16 @@ export const weappPay = (option) => {
|
|||||||
clearTimeout(time)
|
clearTimeout(time)
|
||||||
resolve(success)
|
resolve(success)
|
||||||
}, 3000)
|
}, 3000)
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
subscribeMessage()
|
||||||
|
// #endif
|
||||||
},
|
},
|
||||||
fail: (error) => {
|
fail: (error) => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
if (error.errMsg == 'requestPayment:fail cancel') {
|
if (error.errMsg == 'requestPayment:fail cancel') {
|
||||||
uni.showToast({ title: '已取消支付', icon: 'none', duration: 5000 });
|
uni.showToast({ title: '已取消支付', icon: 'none', duration: 5000 });
|
||||||
|
} else {
|
||||||
|
uni.showToast({ title: error || error.msg, icon: 'none', duration: 5000 });
|
||||||
}
|
}
|
||||||
reject(error)
|
reject(error)
|
||||||
}
|
}
|
||||||
@ -344,12 +349,20 @@ export function wxShowLocation() {
|
|||||||
cancel() {
|
cancel() {
|
||||||
cookie.remove(LATITUDE);
|
cookie.remove(LATITUDE);
|
||||||
cookie.remove(LONGITUDE);
|
cookie.remove(LONGITUDE);
|
||||||
this.$dialog.error("取消获取位置");
|
uni.showToast({
|
||||||
|
title: "取消获取位置",
|
||||||
|
icon: "none",
|
||||||
|
duration: 2000,
|
||||||
|
});
|
||||||
},
|
},
|
||||||
fail() {
|
fail() {
|
||||||
cookie.remove(LATITUDE);
|
cookie.remove(LATITUDE);
|
||||||
cookie.remove(LONGITUDE);
|
cookie.remove(LONGITUDE);
|
||||||
this.$dialog.error("授权失败");
|
uni.showToast({
|
||||||
|
title: "授权失败",
|
||||||
|
icon: "none",
|
||||||
|
duration: 2000,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,10 @@
|
|||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { getBargainPoster, getCombinationPoster } from "@/api/activity";
|
import {
|
||||||
|
getBargainPoster,
|
||||||
|
getCombinationPoster
|
||||||
|
} from "@/api/activity";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Poster",
|
name: "Poster",
|
||||||
@ -36,7 +39,10 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
getBargainPoster: function () {
|
getBargainPoster: function () {
|
||||||
var that = this;
|
var that = this;
|
||||||
getBargainPoster({ bargainId: that.id, from: "wechat" })
|
getBargainPoster({
|
||||||
|
bargainId: that.id,
|
||||||
|
from: "wechat"
|
||||||
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
that.image = res.data.url;
|
that.image = res.data.url;
|
||||||
that.status = false;
|
that.status = false;
|
||||||
@ -52,7 +58,10 @@ export default {
|
|||||||
// 拼团海报
|
// 拼团海报
|
||||||
getCombinationPoster: function () {
|
getCombinationPoster: function () {
|
||||||
var that = this;
|
var that = this;
|
||||||
getCombinationPoster({ id: that.id, from: "wechat" })
|
getCombinationPoster({
|
||||||
|
id: that.id,
|
||||||
|
from: this.$deviceType == 'weixin' || this.$deviceType == 'weixinh5' ? 'uniappH5' : this.$deviceType
|
||||||
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
that.image = res.data.url;
|
that.image = res.data.url;
|
||||||
that.status = false;
|
that.status = false;
|
||||||
@ -73,6 +82,7 @@ export default {
|
|||||||
page {
|
page {
|
||||||
background-color: #eb3729;
|
background-color: #eb3729;
|
||||||
}
|
}
|
||||||
|
|
||||||
.poster-poster {
|
.poster-poster {
|
||||||
height: unset !important;
|
height: unset !important;
|
||||||
}
|
}
|
||||||
|
@ -2,24 +2,12 @@
|
|||||||
<view class="order-submission">
|
<view class="order-submission">
|
||||||
<view class="allAddress" :style="systemStore ? '' : 'padding-top: 0.2*100rpx'">
|
<view class="allAddress" :style="systemStore ? '' : 'padding-top: 0.2*100rpx'">
|
||||||
<view class="nav acea-row">
|
<view class="nav acea-row">
|
||||||
<view
|
<view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)"
|
||||||
class="item font-color-red"
|
v-if="systemStore"></view>
|
||||||
:class="shipping_type === 0 ? 'on' : 'on2'"
|
<view class="item font-color-red" :class="shipping_type === 1 ? 'on' : 'on2'" @click="addressType(1)"
|
||||||
@click="addressType(0)"
|
v-if="systemStore"></view>
|
||||||
v-if="systemStore"
|
|
||||||
></view>
|
|
||||||
<view
|
|
||||||
class="item font-color-red"
|
|
||||||
:class="shipping_type === 1 ? 'on' : 'on2'"
|
|
||||||
@click="addressType(1)"
|
|
||||||
v-if="systemStore"
|
|
||||||
></view>
|
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view class="address acea-row row-between-wrapper" v-if="shipping_type === 0" @click="addressTap">
|
||||||
class="address acea-row row-between-wrapper"
|
|
||||||
v-if="shipping_type === 0"
|
|
||||||
@click="addressTap"
|
|
||||||
>
|
|
||||||
<view class="addressCon" v-if="addressInfo.realName">
|
<view class="addressCon" v-if="addressInfo.realName">
|
||||||
<view class="name">
|
<view class="name">
|
||||||
{{ addressInfo.realName }}
|
{{ addressInfo.realName }}
|
||||||
@ -35,11 +23,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="iconfont icon-jiantou"></view>
|
<view class="iconfont icon-jiantou"></view>
|
||||||
</view>
|
</view>
|
||||||
<div
|
<div class="address acea-row row-between-wrapper" v-if="shipping_type === 1" @click="showStoreList">
|
||||||
class="address acea-row row-between-wrapper"
|
|
||||||
v-if="shipping_type === 1"
|
|
||||||
@click="showStoreList"
|
|
||||||
>
|
|
||||||
<div class="addressCon" v-if="storeItems">
|
<div class="addressCon" v-if="storeItems">
|
||||||
<div class="name">
|
<div class="name">
|
||||||
{{ storeItems.name }}
|
{{ storeItems.name }}
|
||||||
@ -69,10 +53,7 @@
|
|||||||
<text class="iconfont icon-jiantou"></text>
|
<text class="iconfont icon-jiantou"></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view class="item acea-row row-between-wrapper" v-if="deduction === false && enableIntegral === true">
|
||||||
class="item acea-row row-between-wrapper"
|
|
||||||
v-if="deduction === false && enableIntegral === true"
|
|
||||||
>
|
|
||||||
<view>积分抵扣</view>
|
<view>积分抵扣</view>
|
||||||
<view class="discount">
|
<view class="discount">
|
||||||
<view class="select-btn">
|
<view class="select-btn">
|
||||||
@ -124,33 +105,21 @@
|
|||||||
<view class="item">
|
<view class="item">
|
||||||
<view>支付方式</view>
|
<view>支付方式</view>
|
||||||
<view class="list">
|
<view class="list">
|
||||||
<view
|
<view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
|
||||||
class="payItem acea-row row-middle"
|
v-show="isWeixin">
|
||||||
:class="active === 'weixin' ? 'on' : ''"
|
|
||||||
@click="payItem('weixin')"
|
|
||||||
v-show="isWeixin"
|
|
||||||
>
|
|
||||||
<view class="name acea-row row-center-wrapper">
|
<view class="name acea-row row-center-wrapper">
|
||||||
<view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
|
<view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
|
||||||
</view>
|
</view>
|
||||||
<view class="tip">微信快捷支付</view>
|
<view class="tip">微信快捷支付</view>
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
|
||||||
class="payItem acea-row row-middle"
|
v-show="!isWeixin">
|
||||||
:class="active === 'weixin' ? 'on' : ''"
|
|
||||||
@click="payItem('weixin')"
|
|
||||||
v-show="!isWeixin"
|
|
||||||
>
|
|
||||||
<view class="name acea-row row-center-wrapper">
|
<view class="name acea-row row-center-wrapper">
|
||||||
<view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
|
<view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
|
||||||
</view>
|
</view>
|
||||||
<view class="tip">微信快捷支付</view>
|
<view class="tip">微信快捷支付</view>
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view class="payItem acea-row row-middle" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')">
|
||||||
class="payItem acea-row row-middle"
|
|
||||||
:class="active === 'yue' ? 'on' : ''"
|
|
||||||
@click="payItem('yue')"
|
|
||||||
>
|
|
||||||
<view class="name acea-row row-center-wrapper">
|
<view class="name acea-row row-center-wrapper">
|
||||||
<view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付
|
<view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付
|
||||||
</view>
|
</view>
|
||||||
@ -185,21 +154,10 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="settlement" @click="createOrder">立即结算</view>
|
<view class="settlement" @click="createOrder">立即结算</view>
|
||||||
</view>
|
</view>
|
||||||
<CouponListWindow
|
<CouponListWindow v-on:couponchange="changecoupon($event)" v-model="showCoupon" :price="orderPrice.totalPrice"
|
||||||
v-on:couponchange="changecoupon($event)"
|
:checked="usableCoupon.id" @checked="changeCoupon" :cartid="cartid"></CouponListWindow>
|
||||||
v-model="showCoupon"
|
<AddressWindow @checked="changeAddress" @redirect="addressRedirect" v-model="showAddress" :checked="addressInfo.id"
|
||||||
:price="orderPrice.totalPrice"
|
ref="mychild"></AddressWindow>
|
||||||
:checked="usableCoupon.id"
|
|
||||||
@checked="changeCoupon"
|
|
||||||
:cartid="cartid"
|
|
||||||
></CouponListWindow>
|
|
||||||
<AddressWindow
|
|
||||||
@checked="changeAddress"
|
|
||||||
@redirect="addressRedirect"
|
|
||||||
v-model="showAddress"
|
|
||||||
:checked="addressInfo.id"
|
|
||||||
ref="mychild"
|
|
||||||
></AddressWindow>
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
@ -216,11 +174,9 @@
|
|||||||
.order-submission .allAddress {
|
.order-submission .allAddress {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
|
background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
|
||||||
background-image: -webkit-linear-gradient(
|
background-image: -webkit-linear-gradient(to bottom,
|
||||||
to bottom,
|
|
||||||
#eb3729 0%,
|
#eb3729 0%,
|
||||||
#eb3729 100%
|
#eb3729 100%);
|
||||||
);
|
|
||||||
background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
|
background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%);
|
||||||
padding-top: 1 * 100rpx;
|
padding-top: 1 * 100rpx;
|
||||||
}
|
}
|
||||||
@ -308,11 +264,25 @@
|
|||||||
import OrderGoods from "@/components/OrderGoods";
|
import OrderGoods from "@/components/OrderGoods";
|
||||||
import CouponListWindow from "@/components/CouponListWindow";
|
import CouponListWindow from "@/components/CouponListWindow";
|
||||||
import AddressWindow from "@/components/AddressWindow";
|
import AddressWindow from "@/components/AddressWindow";
|
||||||
import { postOrderConfirm, postOrderComputed, createOrder } from "@/api/order";
|
import {
|
||||||
import { mapGetters } from "vuex";
|
postOrderConfirm,
|
||||||
import { handleOrderPayResults } from "@/libs/order";
|
postOrderComputed,
|
||||||
import { weappPay } from "@/libs/wechat";
|
createOrder
|
||||||
import { isWeixin, handleErrorMessage } from "@/utils";
|
} from "@/api/order";
|
||||||
|
import {
|
||||||
|
mapGetters
|
||||||
|
} from "vuex";
|
||||||
|
import {
|
||||||
|
handleOrderPayResults,
|
||||||
|
subscribeMessage
|
||||||
|
} from "@/libs/order";
|
||||||
|
import {
|
||||||
|
weappPay
|
||||||
|
} from "@/libs/wechat";
|
||||||
|
import {
|
||||||
|
isWeixin,
|
||||||
|
handleErrorMessage
|
||||||
|
} from "@/utils";
|
||||||
|
|
||||||
const NAME = "OrderSubmission",
|
const NAME = "OrderSubmission",
|
||||||
_isWeixin = isWeixin();
|
_isWeixin = isWeixin();
|
||||||
@ -546,6 +516,9 @@ export default {
|
|||||||
if (this.$deviceType == "app") {
|
if (this.$deviceType == "app") {
|
||||||
from.from = "app";
|
from.from = "app";
|
||||||
}
|
}
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
subscribeMessage()
|
||||||
|
// #endif
|
||||||
createOrder(this.orderGroupInfo.orderKey, {
|
createOrder(this.orderGroupInfo.orderKey, {
|
||||||
realName: this.contacts,
|
realName: this.contacts,
|
||||||
phone: this.contactsTel,
|
phone: this.contactsTel,
|
||||||
@ -565,7 +538,7 @@ export default {
|
|||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
handleOrderPayResults.call(this, res.data, "create");
|
handleOrderPayResults.call(this, res.data, "create", this.active);
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
handleErrorMessage(err, "创建订单失败");
|
handleErrorMessage(err, "创建订单失败");
|
||||||
|
@ -107,7 +107,11 @@ export default {
|
|||||||
this.mapKey = res.data.mapKey;
|
this.mapKey = res.data.mapKey;
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
this.$dialog.error(err.msg);
|
uni.showToast({
|
||||||
|
title: err.msg,
|
||||||
|
icon: "none",
|
||||||
|
duration: 2000,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,23 +15,16 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="info-wrapper">
|
<view class="info-wrapper">
|
||||||
<view class="picList acea-row row-between mt-20">
|
<view class="picList acea-row row-between mt-20">
|
||||||
<view
|
<view class="pic-box pic-box-color acea-row row-center-wrapper row-column"
|
||||||
class="pic-box pic-box-color acea-row row-center-wrapper row-column"
|
:class="activePic === index ? 'pic-box-color-active' : ''" v-for="(item, index) in picList" :key="index"
|
||||||
:class="activePic === index ? 'pic-box-color-active' : ''"
|
@click="picCharge(index, item)">
|
||||||
v-for="(item, index) in picList"
|
|
||||||
:key="index"
|
|
||||||
@click="picCharge(index, item)"
|
|
||||||
>
|
|
||||||
<view class="pic-number-pic">
|
<view class="pic-number-pic">
|
||||||
<text>
|
<text>
|
||||||
{{ item.value.price }}
|
{{ item.value.price }}
|
||||||
<text class="pic-number">元</text>
|
<text class="pic-number">元</text>
|
||||||
</text>
|
</text>
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view class="pic-number" v-if="item.value.give_price > 0">赠送:{{ item.value.give_price }} 元</view>
|
||||||
class="pic-number"
|
|
||||||
v-if="item.value.give_price > 0"
|
|
||||||
>赠送:{{ item.value.give_price }} 元</view>
|
|
||||||
</view>
|
</view>
|
||||||
<!-- <view
|
<!-- <view
|
||||||
class="pic-box pic-box-color acea-row row-center-wrapper"
|
class="pic-box pic-box-color acea-row row-center-wrapper"
|
||||||
@ -52,10 +45,24 @@
|
|||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { mapGetters } from "vuex";
|
import {
|
||||||
import { weappPay } from "@/libs/wechat";
|
mapGetters
|
||||||
import { rechargeWechat, getRechargeApi } from "@/api/user";
|
} from "vuex";
|
||||||
import { add, sub } from "@/utils/bc";
|
import {
|
||||||
|
weappPay
|
||||||
|
} from "@/libs/wechat";
|
||||||
|
import {
|
||||||
|
rechargeWechat,
|
||||||
|
getRechargeApi
|
||||||
|
} from "@/api/user";
|
||||||
|
import {
|
||||||
|
add,
|
||||||
|
sub
|
||||||
|
} from "@/utils/bc";
|
||||||
|
import {
|
||||||
|
subscribeMessage
|
||||||
|
} from "@/libs/order";
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Recharge",
|
name: "Recharge",
|
||||||
@ -95,8 +102,7 @@ export default {
|
|||||||
})
|
})
|
||||||
.catch((res) => {
|
.catch((res) => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title:
|
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||||
err.msg || err.response.data.msg || err.response.data.message,
|
|
||||||
icon: "none",
|
icon: "none",
|
||||||
duration: 2000,
|
duration: 2000,
|
||||||
});
|
});
|
||||||
@ -154,7 +160,7 @@ export default {
|
|||||||
}
|
}
|
||||||
rechargeWechat({
|
rechargeWechat({
|
||||||
price: prices,
|
price: prices,
|
||||||
from: that.from,
|
from: this.$deviceType == 'weixin' || this.$deviceType == 'weixinh5' ? 'uniappH5' : this.$deviceType,
|
||||||
paid_price: paid_price,
|
paid_price: paid_price,
|
||||||
rechar_id: that.rechar_id,
|
rechar_id: that.rechar_id,
|
||||||
})
|
})
|
||||||
@ -170,6 +176,9 @@ export default {
|
|||||||
icon: "success",
|
icon: "success",
|
||||||
duration: 2000,
|
duration: 2000,
|
||||||
});
|
});
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
subscribeMessage()
|
||||||
|
// #endif
|
||||||
this.$yrouter.back();
|
this.$yrouter.back();
|
||||||
})
|
})
|
||||||
.finally((res) => {
|
.finally((res) => {
|
||||||
@ -191,8 +200,7 @@ export default {
|
|||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title:
|
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||||
err.msg || err.response.data.msg || err.response.data.message,
|
|
||||||
icon: "none",
|
icon: "none",
|
||||||
duration: 2000,
|
duration: 2000,
|
||||||
});
|
});
|
||||||
@ -206,17 +214,21 @@ export default {
|
|||||||
#iframe {
|
#iframe {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pic-box-color-active {
|
.pic-box-color-active {
|
||||||
background-color: #eb3729 !important;
|
background-color: #eb3729 !important;
|
||||||
color: #fff !important;
|
color: #fff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.picList {
|
.picList {
|
||||||
margin-bottom: 0.3 * 100rpx;
|
margin-bottom: 0.3 * 100rpx;
|
||||||
margin-top: 0.3 * 100rpx;
|
margin-top: 0.3 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.font-color {
|
.font-color {
|
||||||
color: #e83323;
|
color: #e83323;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge {
|
.recharge {
|
||||||
border-radius: 0.1 * 100rpx;
|
border-radius: 0.1 * 100rpx;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -228,32 +240,38 @@ export default {
|
|||||||
margin-top: -0.45 * 100rpx;
|
margin-top: -0.45 * 100rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .nav {
|
.recharge .nav {
|
||||||
height: 0.75 * 100rpx;
|
height: 0.75 * 100rpx;
|
||||||
line-height: 0.75 * 100rpx;
|
line-height: 0.75 * 100rpx;
|
||||||
padding: 0 1 * 100rpx;
|
padding: 0 1 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .nav .item {
|
.recharge .nav .item {
|
||||||
font-size: 0.3 * 100rpx;
|
font-size: 0.3 * 100rpx;
|
||||||
color: #333;
|
color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .nav .item.on {
|
.recharge .nav .item.on {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
border-bottom: 0.04 * 100rpx solid #e83323;
|
border-bottom: 0.04 * 100rpx solid #e83323;
|
||||||
}
|
}
|
||||||
.recharge .info-wrapper {
|
|
||||||
}
|
.recharge .info-wrapper {}
|
||||||
|
|
||||||
.recharge .info-wrapper .money {
|
.recharge .info-wrapper .money {
|
||||||
margin-top: 0.6 * 100rpx;
|
margin-top: 0.6 * 100rpx;
|
||||||
padding-bottom: 0.2 * 100rpx;
|
padding-bottom: 0.2 * 100rpx;
|
||||||
border-bottom: 1px dashed #ddd;
|
border-bottom: 1px dashed #ddd;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .money span {
|
.recharge .info-wrapper .money span {
|
||||||
font-size: 0.56 * 100rpx;
|
font-size: 0.56 * 100rpx;
|
||||||
color: #333;
|
color: #333;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .money input {
|
.recharge .info-wrapper .money input {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 3 * 100rpx;
|
width: 3 * 100rpx;
|
||||||
@ -263,30 +281,38 @@ export default {
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding-right: 0.7 * 100rpx;
|
padding-right: 0.7 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .money input::placeholder {
|
.recharge .info-wrapper .money input::placeholder {
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .money input::-webkit-input-placeholder {
|
.recharge .info-wrapper .money input::-webkit-input-placeholder {
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .money input:-moz-placeholder {
|
.recharge .info-wrapper .money input:-moz-placeholder {
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .money input::-moz-placeholder {
|
.recharge .info-wrapper .money input::-moz-placeholder {
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .money input:-ms-input-placeholder {
|
.recharge .info-wrapper .money input:-ms-input-placeholder {
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tip {
|
.tip {
|
||||||
font-size: 0.28 * 100rpx;
|
font-size: 0.28 * 100rpx;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
font-weight: 800;
|
font-weight: 800;
|
||||||
margin-bottom: 0.14 * 100rpx;
|
margin-bottom: 0.14 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .tips span {
|
.recharge .info-wrapper .tips span {
|
||||||
color: #ef4a49;
|
color: #ef4a49;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recharge .info-wrapper .pay-btn {
|
.recharge .info-wrapper .pay-btn {
|
||||||
display: block;
|
display: block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -299,25 +325,30 @@ export default {
|
|||||||
font-size: 0.3 * 100rpx;
|
font-size: 0.3 * 100rpx;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.payment-top {
|
.payment-top {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 3.5 * 100rpx;
|
height: 3.5 * 100rpx;
|
||||||
background-color: #eb3729;
|
background-color: #eb3729;
|
||||||
}
|
}
|
||||||
|
|
||||||
.payment-top .name {
|
.payment-top .name {
|
||||||
font-size: 0.26 * 100rpx;
|
font-size: 0.26 * 100rpx;
|
||||||
color: rgba(255, 255, 255, 0.8);
|
color: rgba(255, 255, 255, 0.8);
|
||||||
margin-top: -0.38 * 100rpx;
|
margin-top: -0.38 * 100rpx;
|
||||||
margin-bottom: 0.3 * 100rpx;
|
margin-bottom: 0.3 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.payment-top .pic {
|
.payment-top .pic {
|
||||||
font-size: 0.32 * 100rpx;
|
font-size: 0.32 * 100rpx;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.payment-top .pic-font {
|
.payment-top .pic-font {
|
||||||
font-size: 0.78 * 100rpx;
|
font-size: 0.78 * 100rpx;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.picList .pic-box {
|
.picList .pic-box {
|
||||||
width: 32%;
|
width: 32%;
|
||||||
height: auto;
|
height: auto;
|
||||||
@ -325,18 +356,22 @@ export default {
|
|||||||
margin-top: 0.21 * 100rpx;
|
margin-top: 0.21 * 100rpx;
|
||||||
padding: 0.2 * 100rpx 0;
|
padding: 0.2 * 100rpx 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pic-box-color {
|
.pic-box-color {
|
||||||
background-color: #f4f4f4;
|
background-color: #f4f4f4;
|
||||||
color: #656565;
|
color: #656565;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pic-number {
|
.pic-number {
|
||||||
font-size: 0.22 * 100rpx;
|
font-size: 0.22 * 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pic-number-pic {
|
.pic-number-pic {
|
||||||
font-size: 0.38 * 100rpx;
|
font-size: 0.38 * 100rpx;
|
||||||
margin-right: 0.1 * 100rpx;
|
margin-right: 0.1 * 100rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pic-box-money {
|
.pic-box-money {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -13,12 +13,7 @@
|
|||||||
<view class="name">所在地区</view>
|
<view class="name">所在地区</view>
|
||||||
<view class="picker acea-row row-between-wrapper select-value form-control">
|
<view class="picker acea-row row-between-wrapper select-value form-control">
|
||||||
<view class="address">
|
<view class="address">
|
||||||
<CitySelect
|
<CitySelect ref="cityselect" :defaultValue="addressText" @callback="result" :items="district"></CitySelect>
|
||||||
ref="cityselect"
|
|
||||||
:defaultValue="addressText"
|
|
||||||
@callback="result"
|
|
||||||
:items="district"
|
|
||||||
></CitySelect>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="iconfont icon-dizhi font-color-red"></view>
|
<view class="iconfont icon-dizhi font-color-red"></view>
|
||||||
</view>
|
</view>
|
||||||
@ -89,7 +84,11 @@ export default {
|
|||||||
that.ready = true;
|
that.ready = true;
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
that.$dialog.error(err.msg);
|
uni.showToast({
|
||||||
|
title: err.msg,
|
||||||
|
icon: "none",
|
||||||
|
duration: 2000,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
getUserAddress: function() {
|
getUserAddress: function() {
|
||||||
|
@ -4,12 +4,7 @@
|
|||||||
<swiper indicatorDots="true">
|
<swiper indicatorDots="true">
|
||||||
<block v-for="(item, infoIndex) in info" :key="infoIndex">
|
<block v-for="(item, infoIndex) in info" :key="infoIndex">
|
||||||
<swiper-item>
|
<swiper-item>
|
||||||
<image
|
<image class="slide-image" :src="item.wap_poster" mode="widthFix" show-menu-by-longpress />
|
||||||
class="slide-image"
|
|
||||||
:src="item.wap_poster"
|
|
||||||
mode="widthFix"
|
|
||||||
show-menu-by-longpress
|
|
||||||
/>
|
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
</block>
|
</block>
|
||||||
</swiper>
|
</swiper>
|
||||||
@ -19,7 +14,9 @@
|
|||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
// import { swiper, swiperSlide } from "vue-awesome-swiper";
|
// import { swiper, swiperSlide } from "vue-awesome-swiper";
|
||||||
import { getSpreadImg } from "@/api/user";
|
import {
|
||||||
|
getSpreadImg
|
||||||
|
} from "@/api/user";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Poster",
|
name: "Poster",
|
||||||
@ -64,11 +61,9 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
getIndex: function () {
|
getIndex: function () {
|
||||||
let that = this;
|
let that = this;
|
||||||
let from = {};
|
getSpreadImg({
|
||||||
if (this.$deviceType == "app") {
|
from: this.$deviceType == 'weixin' || this.$deviceType == 'weixinh5' ? 'uniappH5' : this.$deviceType
|
||||||
from.from = "app";
|
}).then(
|
||||||
}
|
|
||||||
getSpreadImg(from).then(
|
|
||||||
res => {
|
res => {
|
||||||
that.info = res.data;
|
that.info = res.data;
|
||||||
},
|
},
|
||||||
@ -89,8 +84,7 @@ export default {
|
|||||||
if (!wx.saveImageToPhotosAlbum) {
|
if (!wx.saveImageToPhotosAlbum) {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: "提示",
|
title: "提示",
|
||||||
content:
|
content: "当前微信版本过低,无法使用该功能,请升级到最新微信版本后重试。"
|
||||||
"当前微信版本过低,无法使用该功能,请升级到最新微信版本后重试。"
|
|
||||||
});
|
});
|
||||||
that.openDialogVisible = true;
|
that.openDialogVisible = true;
|
||||||
|
|
||||||
@ -141,6 +135,7 @@ export default {
|
|||||||
page {
|
page {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.distribution-posters {
|
.distribution-posters {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,11 @@ const vuexStore = new Vuex.Store({
|
|||||||
reslove(res.data);
|
reslove(res.data);
|
||||||
});
|
});
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
dialog.error("获取信息失败!");
|
uni.showToast({
|
||||||
|
title: "获取信息失败!",
|
||||||
|
icon: "none",
|
||||||
|
duration: 2000,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -113,7 +117,11 @@ const vuexStore = new Vuex.Store({
|
|||||||
});
|
});
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
dialog.error("获取信息失败!");
|
uni.showToast({
|
||||||
|
title: "获取信息失败!",
|
||||||
|
icon: "none",
|
||||||
|
duration: 2000,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
changeLogin({
|
changeLogin({
|
||||||
|
Reference in New Issue
Block a user