Skip to content

S
shop_mobile_uni
Commit 95400609 authored by zhengxiuming's avatar zhengxiuming
Browse files
Options

Merge commit '3db9d32f' into develop

parents c78fe86c 3db9d32f
Show whitespace changes
Inline Side-by-side
Showing with 877 additions and 159 deletions
manifest.json
View file @ 95400609
......@@ -2,7 +2,7 @@
"name": "shop_mobile_uni",
"appid": "__UNI__F904656",
"description": "",
"versionName": "1.0.26",
"versionName": "1.0.27",
"versionCode": "100",
"transformPx": false,
"app-plus": {
......@@ -51,7 +51,7 @@
"mode": "history",
"base": "/uni"
},
"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.26/",
"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.27/",
"optimization": {
"treeShaking": {
"enable": true
......
package.json
View file @ 95400609
{
"name": "shop_mobile_uni",
"version": "1.0.26",
"version": "1.0.27",
"description": "谛宝多多商城",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
......
pages.json
View file @ 95400609
......@@ -209,6 +209,18 @@
"style": {
"navigationBarTitleText": "加入包年计划-谛宝多多商城"
}
},
{
"path": "pages/theRights/theRights",
"style": {
"navigationBarTitleText": "谛宝白条-谛宝多多商城"
}
},
{
"path": "pages/ious_refuse/ious_refuse",
"style": {
"navigationBarTitleText": "谛宝白条-谛宝多多商城"
}
}
],
"globalStyle": {
......
pages/apply/applypage3.vue
View file @ 95400609
......@@ -151,7 +151,7 @@
this.submitFlag = true;
if(res.data.code === 0) {
uni.navigateTo({
url: '/pages/signcontract/signcontract'
url: `/pages/theRights/theRights`
});
} else {
uni.hideToast();
......
pages/financial/financialstage.vue
View file @ 95400609
......@@ -8,7 +8,7 @@
<i class="credit_icon"></i>
谛宝白条
</text> -->
<text class="act">采购分期</text>
<text class="act">谛宝白条</text>
</view>
<!-- <view class="flex_category">
<view class="cate_item1"></view>
......@@ -25,7 +25,7 @@
<view class="fin_select" v-if="EquipmentRecommendList">
<view class="fin_select_label">
<!-- <text class="fin_limit">限时</text> -->
<text class="fin_title">行业精选，更多选择</text>
<text class="fin_title">谛宝白条，乐享轻松</text>
</view>
<text class="fin_desc">0首付，无压力，高端设备，随时拥有</text>
<uni-swiper-dot :info="EquipmentRecommendList" mode="dot" :dotsStyles="{'width': 4,'height':4, 'bottom':0,'border':'none','selectedBorder':'none'}" :current="current">
......@@ -71,6 +71,12 @@
</view>
</view>
<BottomBar />
<uni-popup ref="popup">
<view class="bg">
<view class="btn1" @click="iKonw"></view>
<view class="btn2" @click="checkLines"></view>
</view>
</uni-popup>
</view>
</template>
......@@ -78,6 +84,8 @@
import SearchBar from '@/components/searchbar.vue';
import uniSwiperDot from "@/components/uni-swiper-dot/uni-swiper-dot.vue";
import BottomBar from "@/components/BottomBar/BottomBar.vue";
import uniPopup from "@/components/uni-popup/uni-popup.vue";
import { php } from '@/common/host.js';
export default {
data() {
return {
......@@ -87,7 +95,8 @@
isLogin: 0,
current: 0,
height: false,
equipment_hot_list: []
equipment_hot_list: [],
php: php
}
},
onLoad() {
......@@ -95,7 +104,6 @@
uni.showLoading({
title: '加载中'
});
// #ifdef H5
//默认请求微信分享
if (this.$wechat && this.$wechat.isWechat()) {
......@@ -117,6 +125,11 @@
const EquipmentRecommendList = res.data.data.EquipmentRecommendList;
this.EquipmentRecommendList = EquipmentRecommendList;
this.isLogin = res.data.login_flg;
setTimeout(() => {
if(res.data.data.status === 1 && res.data.data.bounced_flg === 0) {
this.$refs.popup.open();
}
}, 100);
// 热销列表 根据专区类型是否显示
if(EquipmentRecommendList instanceof Array) {
let array = [];
......@@ -183,12 +196,37 @@
uni.navigateTo({
url: url
})
},
iKonw() {
uni.request({
url: '/uni/api/equipment_index/EditEquipmentMember',
method: 'get',
dataType: 'json',
success: (res) => {
if(res.data.code === 0) {
this.$refs.popup.close();
}
}
});
},
checkLines() {
uni.request({
url: '/uni/api/equipment_index/EditEquipmentMember',
method: 'get',
dataType: 'json',
success: (res) => {
if(res.data.code === 0) {
this.$jump(`${php}app=equipment_staging&opt=check`);
}
}
});
}
},
components: {
SearchBar,
uniSwiperDot,
BottomBar
BottomBar,
uniPopup
}
}
</script>
......@@ -458,4 +496,26 @@
top: 48rpx;
}
}
.bg {
width: 674rpx;
height: 734rpx;
background: url(https://dbc-static.oss-cn-beijing.aliyuncs.com/static/%E7%BC%96%E7%BB%84%205.png) no-repeat;
background-size: 100% 100%;
position: relative;
.btn1 {
width: 512rpx;
height: 84rpx;
position: absolute;
left: 50%;
bottom: 102rpx;
margin-left: -256rpx;
}
.btn2 {
width: 100px;
height: 40rpx;
position: absolute;
left: 234rpx;
bottom: 40rpx;
}
}
</style>
pages/installment/installmentinfo.vue
View file @ 95400609
......@@ -192,7 +192,9 @@
equipment_id: '',
is_auth: '0',
type: 2,
sales: ''
sales: '',
status: -1,
enable_flg: -1
}
},
onPageScroll(e){
......@@ -253,6 +255,8 @@
this.isLogin = res.data.login_flg;
this.is_auth = res.data.data.is_auth;
this.type = res.data.data.EquipmentInfo.type;
this.status = res.data.data.status || -1;
this.enable_flg = res.data.data.enable_flg || -1;
}
});
},
......@@ -273,28 +277,22 @@
property_id: this.e_info.property_id
}
if(this.sales) {
}
uni.setStorage({
key: 'sales',
data: this.sales
});
}
uni.setStorage({
key: 'advance_payment',
data: this.e_info.advance_payment
})
if(this.is_auth === '1') {
if(this.type === '1') {
uni.setStorage({
key: 'installment',
data: data,
success: () => {
if(this.status === 0 || this.status === 2) {
uni.navigateTo({
url: '/pages/signcontract/signcontract?type=1'
url: `/pages/theRights/theRights`
});
return
}
});
} else {
uni.setStorage({
key: 'installment',
data: data,
......@@ -305,58 +303,36 @@
});
}
});
}
} else {
if(this.type === '1') {
uni.showToast({
title: '提交中',
icon: 'none'
})
uni.request({
url: '/uni/api/certification/AddRealnameAuth',
data: {
enterprise_name: '深圳市派特堡扬子宠物医院有限公司',
social_credit_code: '91440300MA5FNCJRX2',
legal_name: '汪秀举',
legal_card: '341103198209194417',
card_positive: '11',
card_reverse: '11',
enterprise_type: 1,
organ_type: 11
},
method: 'POST',
success: (res) => {
if(res.data.code === 0) {
} else if (this.is_auth == 0) {
uni.setStorage({
key: 'installment',
data: data,
success: () => {
uni.navigateTo({
url: '/pages/signcontract/signcontract?type=1'
url: `/pages/theRights/theRights?is_auth=${this.is_auth}`
});
}
});
} else {
uni.hideToast();
if(this.enable_flg === '0') {
this.close();
uni.showToast({
title: '您的白条已被禁用',
icon: 'none',
title: res.data.message
duration: 2000
})
return
}
}
})
} else {
uni.setStorage({
key: 'installment',
data: data,
success: () => {
uni.navigateTo({
url: '/pages/certification/certification'
url: '/pages/signcontract/signcontract?type=1'
});
}
});
}
}
},
collectGoods(id, type) {
uni.request({
......
pages/ious_refuse/ious_refuse.vue 0 → 100644
View file @ 95400609
<template>
<view class="main">
<view class="bg"></view>
<view class="refuse_title">很遗憾，您的认证未通过</view>
<view class="reason">您的谛宝白条激活申请，由于 {{reason}} 等原因资质审核未通过</view>
<view class="btn" v-if="repeat_flg !== 0" @click="reupload">重新填写信息</view>
<view class="return_home" @click="return_home">返回商城首页</view>
<view class="refuse_tips">
<text class="icon"></text>
<text>确保所填身份信息真实有效，平台会保护您的信息</text>
</view>
</view>
</template>
<script>
export default {
data() {
return {
reason: '',
repeat_flg: -1
}
},
onLoad(options) {
this.reason = uni.getStorageSync('reason') || '';
this.repeat_flg = options.repeat_flg - 0;
},
methods: {
reupload() {
uni.navigateTo({
url: '/pages/apply/applypage1'
});
},
return_home() {
uni.navigateTo({
url: '/pages/home/home'
});
}
}
}
</script>
<style lang="scss" scoped>
.main {
.bg {
width: 258rpx;
height: 180rpx;
background: url(https://dbc-static.oss-cn-beijing.aliyuncs.com/static/chahua_jieshu%403x.png) no-repeat;
background-size: 100% 100%;
margin: 200rpx auto 24rpx;
}
.refuse_title {
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
font-size: 48rpx;
height: 66prx;
line-height: 66rpx;
text-align: center;
margin-bottom: 24rpx;
}
.reason {
color: #6E6E6E;
font-size: 28rpx;
line-height: 40rpx;
text-align: center;
padding: 0 32rpx;
}
.btn {
width: 240rpx;
height: 80rpx;
text-align: center;
line-height: 80rpx;
border-radius: 16rpx;
background: #FFDB00;
color: #000;
font-size: 28rpx;
margin: 80rpx auto 24rpx;
}
.return_home {
color: #867015;
font-size: 28rpx;
height: 40rpx;
line-height: 40rpx;
text-align: center;
margin-bottom: 24rpx;
}
.refuse_tips {
font-size: 24rpx;
color: #979797;
text-align: center;
}
.icon {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAACxklEQVRYR+2YPWhTURSAvyQ2tTFtrbURNJXWOkiRLqIEB7UUu7iLiIgubtrNwUlEqnaRWEHQwVKSIOIi6Kzt4KAI2i4dLA0aBbWx2oZUoy9PbmMkzfu770d4SC+85b3z871z7jn3J6CqqoqPR2AN0GV2/ucIKlDMQmEGSp/h11LlEWNdc+UJd0B0F0S6gJCjWNqPoFKA/AQsTYHyXc5paD0090H7QQhF5XT+SMkDqgp8mYSFZ1Au2XLyVzgYhrb9sOkABOQiKgcoovbhHiy/cwZWr9XUCVuPSUXTGrD0Ed6n4ec3b+CqVhpaYdsJCMdM7ZoDisi9ve09XC3k9jOmkTQGFHMud9e7tBrFSaQ7ftpwThoD5p9A/qm3aTWy1n4I2vt1v+oDitTOJZ1Xq93fEtXdPaSban3AT4/h63O7btzJb9wHsSMaGzqACsyOyDdhm1iPJrI0NYYYSHSu1hTNvOe8ZsXRAhZnITdu062c+KVbLxh7OEMoGODl/aO0RMOrFeMnIdKz6p0W8B+ltwonvCf6tpAZGdT+lU6atYC5MSjOyYVEUqoWbk9vB2OXB9gQadBqR7ohfsoigtlRKM1LurYWk4YTpsKboeusBeCbYSj/sPYsIWELTtgLNsLOC84Bz12ZRFFgeChBa3PdBK8Dtg0nDWiQ4vmFZRLHH1BWoXdHG+lrg4aQjuCkU2xSJMnUa5KpqZVYGUE6hhNGpYrEos1cH3/FaGZaF9IVnLAo1WYkGnU9ZOrqYW6kp1aasBimrcSsuKQaNXJLXS1kW0sjC4uVyncMJ73UCS+Sq0ktpCs4g/SK1663W6Jwbmam2bs7xp2L/forhFXPtL3dEgZtbFgXCyXtwm8FVfvd9oZVKPt+yy8gfX1oqqbA18fOKqSvD+5VSF9ffdRWnG8vjzRtw6/Xb3b6mwey1pdHHjhxY2IN0E30hO5vSvzJmNdXsP8AAAAASUVORK5CYII=) no-repeat;
background-size: 100% 100%;
display: inline-block;
width: 29rpx;
height: 29rpx;
border-radius: 50%;
vertical-align: middle;
margin-right: 2px;
}
}
</style>
\ No newline at end of file
pages/refuse/refuse.vue
View file @ 95400609
......@@ -13,11 +13,11 @@
</view>
<view class="refuse_view">
<view class="title">已驳回</view>
<view class="refuse_content">尊敬的用户，您好！您本次的采购分期申请已被驳回，定金已退还至您的余额，驳回原因如下：
<view class="refuse_content">尊敬的用户，您好！您本次的谛宝白条申请已被驳回，定金已退还至您的余额，驳回原因如下：
</view>
<view class="refuse_item">{{data.dismiss_reason}}</view>
</view>
<view class="reupload" @click="reupload()">重新上传资质</view>
<!-- <view class="reupload" @click="reupload()">重新上传资质</view> -->
</view>
</template>
......
pages/signcontract/signcontract.vue
View file @ 95400609
......@@ -138,7 +138,7 @@
}
if(!this.is_agree){
uni.showToast({
title: '请阅读并同意采购分期合同',
title: '请阅读并同意谛宝白条合同',
duration: 2000,
icon: 'none'
});
......
pages/theRights/theRights.vue 0 → 100644
View file @ 95400609
This source diff could not be displayed because it is too large. You can view the blob instead.
static/iconfont.css
View file @ 95400609
@font-face {
font-family: "eosfont";
src: url('https://at.alicdn.com/t/font_1878093_3hvt9j2lgso.eot');
src: url('https://at.alicdn.com/t/font_1878093_3hvt9j2lgso.eot?#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_1878093_3hvt9j2lgso.woff2') format('woff2'),
url('https://at.alicdn.com/t/font_1878093_3hvt9j2lgso.woff') format('woff'),
url('https://at.alicdn.com/t/font_1878093_3hvt9j2lgso.ttf') format('truetype'),
url('https://at.alicdn.com/t/font_1878093_3hvt9j2lgso.svg#iconfont') format('svg');
src: url('https://at.alicdn.com/t/font_1878093_zr6tt1qw9ct.eot');
src: url('https://at.alicdn.com/t/font_1878093_zr6tt1qw9ct.eot?#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_1878093_zr6tt1qw9ct.woff2') format('woff2'),
url('https://at.alicdn.com/t/font_1878093_zr6tt1qw9ct.woff') format('woff'),
url('https://at.alicdn.com/t/font_1878093_zr6tt1qw9ct.ttf') format('truetype'),
url('https://at.alicdn.com/t/font_1878093_zr6tt1qw9ct.svg#iconfont') format('svg');
}
.eosfont {
......
store/store.js
View file @ 95400609
......@@ -4,7 +4,7 @@ Vue.use(Vuex)
const store = new Vuex.Store({
state: {
webviewUrl: '',
installment: {} //采购分期存储的数据
installment: {} //谛宝白条存储的数据
},
mutations: {
changeWebviewUrl(state, url) {
......
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