Skip to content

S
shop_mobile_uni
Commit 1aeed4a6 authored by 王建威's avatar 王建威
Browse files
Options

bug fix

parent ad216e1a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 77 deletions
main.js
View file @ 1aeed4a6
......@@ -68,6 +68,10 @@ function __reloadResource(_this) {
function jumpGoodDetail(goods_id) {
window.location.href = `${php}app=goods&id=${goods_id}`;
}
function jumpOrderDetail(order_id) {
window.location.href = `${php}app=buyer_order&act=view&order_id=${order_id}`;
}
function backup() {
......@@ -105,6 +109,7 @@ function jump(url, type) {
Vue.prototype.$jumpGoodDetail = jumpGoodDetail;
Vue.prototype.$jump = jump;
Vue.prototype.$jumpOrderDetail = jumpOrderDetail;
Vue.prototype.$getCache = getCache;
Vue.prototype.$addCart = addCart;
Vue.prototype.$backup = backup;
......
pages.json
View file @ 1aeed4a6
......@@ -177,13 +177,13 @@
{
"path": "pages/monthly/monthly",
"style": {
"navigationBarTitleText": "连续包月计划-谛宝多多商城"
"navigationBarTitleText": "包年计划-谛宝多多商城"
}
},
{
"path": "pages/monthlyIntroduce/monthlyIntroduce",
"style": {
"navigationBarTitleText": "包月说明-谛宝多多商城"
"navigationBarTitleText": "包年说明-谛宝多多商城"
}
},
{
......
pages/monthly/monthly.vue
View file @ 1aeed4a6
This diff is collapsed.
pages/monthlyContract/monthlyContract.vue
View file @ 1aeed4a6
......@@ -37,13 +37,13 @@
<view class="con_detail spec_color">{{data[0].apply_status_name}}</view>
</view>
</view>
<view class="check_btn">查看合同</view>
<view class="check_btn" @click="check(data[0].view_url)">查看合同</view>
</view>
<view class="contract_bar" v-if="data.length>1">
<text class="left">其他合同</text>
</view>
<view style="padding: 0;" v-if="data.length>1">
<view class="now_contract packup" v-for="(item, index) in data" :key="index" v-if="index !== 0" :style="[rotate && (rotateKey === index) ? {'height':'400rpx'} : null]">
<view class="now_contract packup" v-for="(item, index) in data" :key="index" v-if="index !== 0" :style="[rotate[index]['rotate'] ? {'height':'400rpx'} : null]">
<view class="contract_flex">
<view class="flex_left">
<view class="con_title">合同时长</view>
......@@ -75,8 +75,9 @@
<view class="con_detail spec_color">{{item.apply_status_name}}</view>
</view>
</view>
<text class="eosfont" :class="{rotate: (index === rotateKey) && rotate}" @click="pack(index)">&#xe729;</text>
<view class="check_btn">查看合同</view>
<text class="eosfont" :class="{rotate: rotate[index]['rotate']}"
@click="pack(index)">&#xe729;</text>
<view class="check_btn" @click="check(item.view_url)">查看合同</view>
</view>
</view>
</view>
......@@ -95,7 +96,7 @@
min_quantity: '',
apply_status_name: ''
}],
rotate: false,
rotate: [],
rotateKey: -1
}
},
......@@ -107,6 +108,12 @@
success: (res) => {
if(res.data.code === 0) {
this.data = res.data.data;
let arr = [];
res.data.data && res.data.data.map((item, index) => {
let o = {rotate: false};
arr.push(o);
});
this.rotate = arr;
}
}
});
......@@ -140,8 +147,12 @@
});
},
pack(key) {
this.rotateKey = key;
this.rotate = !this.rotate;
this.rotate[key]['rotate'] = !this.rotate[key]['rotate'];
},
check(url) {
uni.navigateTo({
url: `/pages/web/web?contract_url=${url}`
});
}
},
components: {
......
pages/monthlyDeposit/monthlyDeposit.vue
View file @ 1aeed4a6
<template>
<view class="main">
<TopBar title="缴纳定金" :bold="true" />
<TopBar title="缴纳押金" :bold="true" />
<view class="deposit_card">
<view class="bar">
<text class="title1">当前计划详情</text>
<text class="title2">/ 缴纳定金后即可享受计划</text>
<text class="title2">/ 缴纳押金后即可享受计划</text>
</view>
<view class="tip1">开通时间</view>
<view class="month">{{data.contract_period}}个月</view>
<view class="month">{{data.contract_period || 0}}个月</view>
<view class="tip2">计划持续时间</view>
<view class="info_box">
<view class="info_item info1">
<view class="tip1">商品折扣</view>
<view class="month">{{data.discount*10}}折</view>
<view class="month">{{data.discount*10 || 0}}折</view>
<view class="tip2">包年计划内商品</view>
</view>
<view class="info_item info2">
<view class="tip1">押金</view>
<view class="month">{{data.min_quantity*data.deposit/100}}元</view>
<view class="month">{{(data.min_quantity*data.deposit/100) || 0}}元</view>
<view class="tip2">达成计划后退还</view>
</view>
</view>
<view class="check_btn">查看我的合同</view>
<view class="pay_btn" @click="goPay">支付押金 ¥{{data.min_quantity*data.deposit/100}}</view>
<view class="check_btn" @click="previewContract">查看我的合同</view>
<view class="pay_btn" @click="goPay">支付押金 ¥{{(data.min_quantity*data.deposit/100) || 0}}</view>
<view class="cancel_btn" @click="open">取消支付 重新签署合同</view>
</view>
<uni-popup ref="popup">
......@@ -59,9 +59,9 @@
</uni-popup>
<uni-popup ref="pay" type="bottom">
<view class="popup_content">
<view class="popup_top_bar">选择支付方式<text @click="close()"></text></view>
<view class="popup_top_bar">选择支付方式<text @click="closePay"></text></view>
<view class="flex">
<text class="pay_title">支付定金</text>
<text class="pay_title">支付押金</text>
<text class="pay_num">¥{{data.min_quantity*data.deposit/100}}</text>
</view>
<view class="flex pay_item" @click="handleSelect(1)">
......@@ -107,7 +107,8 @@
return {
data: {},
type: 1,
isWx: false
isWx: false,
pageShow: false
}
},
onLoad(options) {
......@@ -118,6 +119,16 @@
dataType: 'json',
success: (res) => {
if(res.data.code === 0) {
if(res.data.data === null) {
uni.showToast({
title: '您已支付过押金',
icon: 'none'
});
setTimeout(() => {
this.$jump('/pages/monthly/monthly', 2);
}, 2000);
return
}
this.data = res.data.data;
} else {
uni.showToast({
......@@ -138,6 +149,9 @@
goPay() {
this.$refs.pay.open();
},
closePay() {
this.$refs.pay.close();
},
// 选择支付方式
handleSelect(type){
this.type = type;
......@@ -147,6 +161,8 @@
const {origin} = location;
const amount = this.data.min_quantity*this.data.deposit/100;
// 余额支付
this.pageShow = true;
this.$refs.pay.close();
if(this.type === 1){
uni.navigateTo({
url: `/pages/yuepay/yuepay?amount=${amount}&money=${this.data.money}&order_id=${this.data.order_no}&type=monthly`
......@@ -202,6 +218,7 @@
},
success: (res) => {
if(res.data.code === 0) {
this.close()
uni.showToast({
title: '您的合同已取消',
icon: 'none'
......@@ -212,6 +229,25 @@
}
}
});
},
previewContract() {
uni.showLoading({
title: '获取合同中'
});
uni.request({
url: '/uni/api/month_signcontract/PreviewContract',
method: 'POST',
dataType: 'json',
data: {},
success: (res) => {
if(res.data.code === 0) {
uni.hideLoading();
uni.navigateTo({
url: `/pages/web/web?contract_url=${res.data.data.viewUrl}`
});
}
}
})
}
},
components: {
......
pages/monthlyIntroduce/monthlyIntroduce.vue
View file @ 1aeed4a6
......@@ -12,27 +12,41 @@
<view class="content_title">
<text class="circle_num">1</text>怎么包月？
</view>
<view class="content_main">点击下方选择起订量，选择拿货周期和起订量，签署合同，缴纳定金，则完成包月，合同有效期内，购买包月产品，立享折扣。</view>
<view class="content_main">点击下方选择起订量，选择拿货周期和起订量，签署合同，缴纳押金，则完成包月，合同有效期内，购买包月产品，立享折扣。</view>
<view class="content_title">
<text class="circle_num">1</text>关于定金
<text class="circle_num">1</text>关于押金
</view>
<view class="content_main">合同有效期内，包月产品消费总额（折扣价）达到起订量，自合同结束日期5个工作日内，全额退还定金，否则不予以退还。</view>
<view class="content_main">合同有效期内，包月产品消费总额（折扣价）达到起订量，自合同结束日期5个工作日内，全额退还押金，否则不予以退还。</view>
<view class="content_title">
<text class="circle_num">1</text>缴纳定金与不缴纳定金的区别
<text class="circle_num">1</text>缴纳押金与不缴纳押金的区别
</view>
<view class="content_main">缴纳定金，合同有效期内购买包月产品可立享全额折扣；不缴纳定金，合同有效期内购买包月产品，统一享受8.5折，合同有效期内，包月产品消费总额（折扣价）达到起订量，自合同结束日期5个工作日内，按差价返现至账户余额，可提现，（例如全额折扣为6折，则返现消费总额的25%）反之不予以返现。</view>
<view class="content_main">缴纳押金，合同有效期内购买包月产品可立享全额折扣；不缴纳押金，合同有效期内购买包月产品，统一享受8.5折，合同有效期内，包月产品消费总额（折扣价）达到起订量，自合同结束日期5个工作日内，按差价返现至账户余额，可提现，（例如全额折扣为6折，则返现消费总额的25%）反之不予以返现。</view>
<view class="content_title" style="margin-bottom: 0;">有任何问题</view>
<view class="content_title">烦请点击页面上的消息按钮进行</view>
<view class="join_btn">加入包年计划</view>
<view class="content_title">烦请点击页面上的消息按钮进行咨询</view>
<view class="join_btn" @click="joinMonthly">加入包年计划</view>
</view>
</view>
</template>
<script>
import { login } from '@/common/util.js';
export default {
data() {
return {
login_flg: 0
}
},
onLoad(options) {
this.login_flg = options.login_flg - 0;
},
methods: {
// 加入计划
joinMonthly() {
if(!this.login_flg) {
login();
return
}
this.$jump('/pages/monthlyJoin/monthlyJoin',2)
}
}
}
......
pages/monthlyJoin/monthlyJoin.vue
View file @ 1aeed4a6
......@@ -35,12 +35,12 @@
</view>
<view class="bar">
<text class="title1">选择押金方案</text>
<text class="title2">/ 达成计划后将退还定金</text>
<text class="title2">/ 达成计划后将退还押金</text>
</view>
<view class="pay_card">
<view class="title1" v-if="depositKey === '1'">先缴纳押金，可立享即时折扣</view>
<view class="title1" v-else>0押金，先按原价购买</view>
<view class="title2" v-if="depositKey === '1'">达成计划：退还定金¥{{Number(ruleList[key]['child'][monthKey]['min_quantity'])*Number(ruleList[key]['child'][monthKey]['deposit'])/100}}</view>
<view class="title2" v-if="depositKey === '1'">达成计划：退还押金¥{{Number(ruleList[key]['child'][monthKey]['min_quantity'])*Number(ruleList[key]['child'][monthKey]['deposit'])/100}}</view>
<view class="title2" v-else>达成计划：满¥{{ruleList[key]['child'][monthKey]['min_quantity']}}按{{Number(ruleList[key]['child'][monthKey]['discount'])*10}}折返现</view>
<view class="pay_box">
<view class="pay_item" :class="{act: depositKey === '1'}" @click="changeDeposit('1')">
......@@ -58,7 +58,7 @@
<text class="checked eosfont" v-if="checked" @click="check">&#xe61e;</text>
<text class="uncheked" v-else @click="check"></text>
<text>我已阅读</text>
<text class="contract">《谛宝多多包年会员合同》</text>
<text class="contract" @click="previewContract">《谛宝多多包年会员合同》</text>
</view>
<view class="fixed_bottom" @click="submit">同意并签署合同</view>
</view>
......@@ -176,6 +176,25 @@
} else {
this.$jump(`/pages/certification/certification?month_rule_id=${this.month_rule_id}&is_deposit=${this.depositKey}`,2)
}
},
previewContract() {
uni.showLoading({
title: '获取合同中'
});
uni.request({
url: '/uni/api/month_signcontract/PreviewContract',
method: 'POST',
dataType: 'json',
data: {},
success: (res) => {
if(res.data.code === 0) {
uni.hideLoading();
uni.navigateTo({
url: `/pages/web/web?contract_url=${res.data.data.viewUrl}`
});
}
}
})
}
},
components: {
......
pages/monthlyPlan/monthlyPlan.vue
View file @ 1aeed4a6
......@@ -47,7 +47,7 @@
<view class="pro_item" v-for="(item, index) in month_order_list" :key="index">
<view class="item_top">计划内采购金额：<text>¥{{item.total_price}}</text></view>
<view class="item_content">
<view class="content_item" v-for="(vo, key) in item.child" :key="key" @click="$jumpGoodDetail(vo.goods_id)">
<view class="content_item" v-for="(vo, key) in item.child" :key="key" @click="$jumpOrderDetail(vo.order_id)">
<image class="item_img" :src="vo.goods_image || $noGoodsImg"/>
<view>
<view class="item_name">{{vo.goods_name}}</view>
......@@ -92,6 +92,14 @@
});
this.month_order_list = res.data.data.month_order_list;
} else {
uni.showModal({
title: '提示',
content: '当前没有可履行的合同',
success: () => {
this.$jump('/pages/monthly/monthly',2);
}
})
}
}
})
......
pages/search/search.vue
View file @ 1aeed4a6
......@@ -63,7 +63,7 @@
</view>
<view v-if="!isLogin" class="unlogin_price">登录显示价格</view>
<!-- <view class="old-price"><text class="price-tips">￥</text>30.00</view> -->
<image class="cart-icon" @click="addCart(item._source.default_spec, 1)" src="https://dbc-static.oss-cn-beijing.aliyuncs.com/credit_shop/global/icon_gouwuche%402x.png"></image>
<text class="cart-icon eosfont" @click="addCart(item._source.default_spec, 1)">&#xe74a;</text>
</view>
</view>
<uni-load-more :status="loadingType"></uni-load-more>
......@@ -458,10 +458,9 @@
}
.cart-icon{
position: absolute;
width: 64rpx;
height: 64rpx;
right: 24rpx;
bottom: 52rpx;
bottom: 72rpx;
color: #7C7C7C;
}
}
}
......
pages/web/web.vue
View file @ 1aeed4a6
<template>
<view>
<TopBar title="分期合同"/>
<TopBar title="我的合同"/>
<web-view :src="url"></web-view>
</view>
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment