faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-05-14 17:44:25 +08:00
parent 1013ef4e55
commit 6b402a0d47
26 changed files with 490 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -21,7 +21,7 @@
balance_func_status: 0, //余额开关
recharge_switch: 0, // 充值开关
store_user_min_recharge: 0, //最小充值
yue_pay_status: 0, //消费券支付开关
yue_pay_status: 0, //余额支付开关
alipay_open: 0, //支付宝支付开关
integration_pay_open:0,//铸源星兑付开关
routine_logo: '', //首页logo

8
api/store.js
View File

@ -458,6 +458,14 @@ export function getApplicationRecordList(data) {
export function getGoodsDetails(id) {
return request.get('intention/detail/' + id, {});
}
/**
* 获取商户申请详情
* @param int id
*
*/
export function getIntentionBank(data) {
return request.post('intention/bank', data);
}
/**
* 修改入驻信息
* @param int id

2
components/PriceChange/index.vue
View File

@ -40,7 +40,7 @@
</view>
</view>
<view v-if="orderInfo.integral_price>0" class="item acea-row row-between-wrapper">
<view>铸源星支付(¥)</view>
<view>铸源星抵扣(¥)</view>
<view class="money">
{{ orderInfo.integral_price }}<span class="iconfont icon-suozi"></span>
</view>

2
components/discountDetails/index.vue
View File

@ -16,7 +16,7 @@
</view>
</view>
<view v-if="couponData.order_total_integral_price>0" class="check-item">
<view>铸源星支付：</view>
<view>铸源星抵扣：</view>
<view class="radio">
-￥{{couponData.order_total_integral_price}}
</view>

2
components/pay/index.vue
View File

@ -10,7 +10,7 @@
请输入支付密码
</view>
<view class="subTitle" v-show="show_subTitle&&show_integral">
铸源星支付:{{price*integral_cash_time}}
铸源星抵扣:{{price*integral_cash_time}}
</view>
<view class="subTitle" v-show="show_subTitle&&!show_integral">
付款{{price}}

8
config/app.js
View File

@ -6,12 +6,12 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.1.107:8080' //测试
let httpApi = 'https://api.tropjoin.com' //生产
let httpApi = 'http://192.168.1.107:8080' //测试
// let httpApi = 'https://api.tropjoin.com' //生产
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net
// let wsApi = 'ws://192.168.1.107:8080'
let wsApi = 'wss://ws.tropjoin.com'
let wsApi = 'ws://192.168.1.107:8080'
// let wsApi = 'wss://ws.tropjoin.com'
module.exports = {
// 请求域名 格式： https://您的域名

2
manifest.json
View File

@ -1,5 +1,5 @@
{
"name" : "铸源优品",
"name" : "铸源商城",
"appid" : "__UNI__496DF55",
"description" : "",
"versionName" : "1.0.2",

6
mixins/history.js
View File

@ -9,9 +9,9 @@ export default {
methods: {
getHistory() {
console.log(this.$util.getNowUrl(),'page')
history({
page:this.$util.getNowUrl()
}).then(res=>{})
// history({
// page:this.$util.getNowUrl()
// }).then(res=>{})
},
}
};

4
pages/admin/orderDetail/index.vue
View File

@ -86,7 +86,7 @@
</view>
<view class="item acea-row row-between">
<view>支付方式：</view>
<view class="conter">{{ orderInfo.pay_type == 0 ? "消费券支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }}</view>
<view class="conter">{{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }}</view>
</view>
<view class="item acea-row row-between">
<view>买家留言：</view>
@ -112,7 +112,7 @@
<view class="conter">-￥{{ orderInfo.coupon_price }}</view>
</view>
<view v-if="orderInfo.integral_price > 0" class="item acea-row row-between">
<view>铸源星支付：</view>
<view>铸源星抵扣：</view>
<view class="conter">-￥{{ orderInfo.integral_price }}</view>
</view>
<view v-if="orderInfo.pay_postage > 0" class="item acea-row row-between">

4
pages/order_details/index.vue
View File

@ -208,7 +208,7 @@
</view>
<view class='item acea-row row-between'>
<view>支付方式：</view>
<view class='conter' v-if="orderInfo.pay_type==0">消费券支付</view>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
</view>
@ -362,7 +362,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "消费券支付",
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',

4
pages/order_details/stay.vue
View File

@ -152,7 +152,7 @@
<view class='conter'>-￥{{orderInfo.coupon_price}}</view>
</view>
<view class='item acea-row row-between' v-if='orderInfo.integral'>
<view>铸源星支付：</view>
<view>铸源星抵扣：</view>
<view class='conter'>-￥{{orderInfo.integral_price}}</view>
</view>
<view class='item acea-row row-between'>
@ -221,7 +221,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "消费券支付",
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',

2
pages/points_mall/exchange_record.vue
View File

@ -87,7 +87,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "消费券支付",
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',

2
pages/points_mall/integral_order.vue
View File

@ -188,7 +188,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
"name": "消费券支付",
"name": "余额支付",
"icon": "icon-icon-test",
value: 'balance',
title: '可用余额:',

2
pages/points_mall/integral_order_details.vue
View File

@ -172,7 +172,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "消费券支付",
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',

379
pages/store/component/superwei-combox.vue Normal file
View File

@ -0,0 +1,379 @@
<template>
<view class="superwei-combox" :class="border ? '' : 'superwei-combox__no-border'">
<view v-if="label" class="superwei-combox__label" :style="labelStyle">
<text>{{label}}</text>
</view>
<view class="superwei-combox__input-box">
<input class="superwei-combox__input" type="text" :placeholder="placeholder"
placeholder-class="superwei-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus"
@blur="onBlur" />
<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="toggleSelector">
</uni-icons>
</view>
<view class="superwei-combox__selector" v-if="showSelector">
<view class="uni-popper__arrow"></view>
<scroll-view scroll-y="true" class="superwei-combox__selector-scroll">
<view class="superwei-combox__selector-empty" v-if="filterCandidatesLength === 0">
<text>{{emptyTips}}</text>
</view>
<view class="superwei-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index">
<template v-if="(isJSON?(item.disabled?true:false):false)">
<text
:style="'color:'+disabledColor+';cursor: not-allowed;'">{{isJSON?item[keyName]?item[keyName]:'字段'+keyName+'不存在':item}}</text>
</template>
<template v-else>
<text @click="onSelectorClick(index)"
:style="(isJSON?item[keyName]?item[keyName]==inputVal:false:item==inputVal)?'font-weight: bold;background-color: '+selectedBackground+';color: '+selectedColor:''">{{isJSON?item[keyName]?item[keyName]:'字段'+keyName+'不存在':item}}</text>
</template>
</view>
</scroll-view>
</view>
</view>
</template>
<script>
/**
* Combox 组合输入框
* @description 组合输入框一般用于既可以输入也可以选择的场景
* @property {String} label 左侧文字
* @property {String} labelWidth 左侧内容宽度
* @property {String} placeholder 输入框占位符
* @property {Array} candidates 候选项列表
* @property {String} emptyTips 筛选结果为空时显示的文字
* @property {String} value 组合框的值
* @property {String} selectedBackground 选中项背景颜色
* @property {String} selectedColor 选中项文字颜色
* @property {Boolean} isJSON 是否是json数组
* @property {String} keyName json数组显示的字段值
* @property {String} disabledColor 禁用项文字颜色
* @property {Boolean} isAllowCreate 是否允许用户创建新条目
*/
export default {
name: 'superweiCombox',
emits: ['input', 'update:modelValue', 'select'],
props: {
isAllowCreate: {
type: Boolean,
default: true
},
disabledColor: {
type: String,
default: '#ababac'
},
isJSON: {
type: Boolean,
default: false
},
keyName: {
type: String,
default: ''
},
selectedBackground: {
type: String,
default: '#f5f7fa'
},
selectedColor: {
type: String,
default: '#409eff'
},
border: {
type: Boolean,
default: true
},
label: {
type: String,
default: ''
},
labelWidth: {
type: String,
default: 'auto'
},
placeholder: {
type: String,
default: ''
},
candidates: {
type: Array,
default () {
return []
}
},
emptyTips: {
type: String,
default: '无匹配项'
},
// #ifndef VUE3
value: {
type: [String, Number],
default: ''
},
// #endif
// #ifdef VUE3
modelValue: {
type: [String, Number],
default: ''
},
// #endif
},
data() {
return {
isInput: false,
showSelector: false,
isSelector: false,
inputVal: ''
}
},
computed: {
labelStyle() {
if (this.labelWidth === 'auto') {
return ""
}
return `width: ${this.labelWidth}`
},
filterCandidates() {
if (this.isInput) {
if (this.isJSON) {
return this.candidates.filter((item) => {
return item[this.keyName].toString().indexOf(this.inputVal) > -1
})
} else {
return this.candidates.filter((item) => {
return item.toString().indexOf(this.inputVal) > -1
})
}
} else {
return this.candidates
}
},
filterCandidatesLength() {
return this.filterCandidates.length
}
},
watch: {
// #ifndef VUE3
value: {
handler(newVal) {
this.inputVal = newVal
this.isInput = true
},
immediate: true
},
// #endif
// #ifdef VUE3
modelValue: {
handler(newVal) {
this.inputVal = newVal
this.isInput = true
},
immediate: true
},
// #endif
},
methods: {
toggleSelector() {
this.showSelector = !this.showSelector
this.isInput = false
},
onFocus() {
this.showSelector = true
this.isInput = false
},
onChange() {
setTimeout(() => {
this.showSelector = false
this.isInput = false
}, 200)
},
onBlur() {
if (!this.isInput) {
this.onChange()
} else {
if (this.inputVal && !this.isAllowCreate) {
let index = this.candidates.findIndex((item) => {
if (this.isJSON) {
return item[this.keyName].toString() == this.inputVal && !item.disabled
} else {
return item.toString() == this.inputVal
}
})
if (index == -1) {
if (this.filterCandidatesLength > 0) {
setTimeout(() => {
this.showSelector = false
this.isInput = false
if (!this.isSelector) {
this.inputVal = ''
this.$emit('input', this.inputVal)
this.$emit('update:modelValue', this.inputVal)
}
}, 200)
this.isSelector = false
} else {
this.showSelector = false
this.isInput = false
this.inputVal = ''
this.$emit('input', this.inputVal)
this.$emit('update:modelValue', this.inputVal)
}
} else {
this.onChange()
}
} else {
this.onChange()
}
}
},
onSelectorClick(index) {
let item = this.filterCandidates[index]
if (this.isJSON) {
this.inputVal = item[this.keyName]
} else {
this.inputVal = item
}
this.showSelector = false
this.isSelector = true
this.$emit('input', this.inputVal)
this.$emit('update:modelValue', this.inputVal)
this.$emit('select', item)
},
onInput() {
setTimeout(() => {
this.$emit('input', this.inputVal)
this.$emit('update:modelValue', this.inputVal)
})
}
}
}
</script>
<style lang="scss" scoped>
.superwei-combox {
font-size: 14px;
border: 1px solid #DCDFE6;
border-radius: 4px;
padding: 6px 10px;
position: relative;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
// height: 40px;
flex-direction: row;
align-items: center;
// border-bottom: solid 1px #DDDDDD;
}
.superwei-combox__label {
font-size: 16px;
line-height: 22px;
padding-right: 10px;
color: #999999;
}
.superwei-combox__input-box {
position: relative;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex: 1;
flex-direction: row;
align-items: center;
cursor: pointer;
}
.superwei-combox__input {
flex: 1;
font-size: 14px;
height: 22px;
line-height: 22px;
}
.superwei-combox__input-plac {
font-size: 14px;
color: #ccc; //placeholder-style="color:#FFFFFF"
}
.superwei-combox__selector {
/* #ifndef APP-NVUE */
box-sizing: border-box;
/* #endif */
position: absolute;
top: calc(100% + 12px);
left: 0;
width: 100%;
background-color: #FFFFFF;
border: 1px solid #EBEEF5;
border-radius: 6px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
z-index: 2;
padding: 4px 0;
}
.superwei-combox__selector-scroll {
/* #ifndef APP-NVUE */
max-height: 200px;
box-sizing: border-box;
/* #endif */
}
.superwei-combox__selector-empty,
.superwei-combox__selector-item {
/* #ifndef APP-NVUE */
display: flex;
cursor: pointer;
/* #endif */
line-height: 36px;
font-size: 14px;
text-align: center;
// border-bottom: solid 1px #DDDDDD;
padding: 0px 0px;
}
.superwei-combox__selector-empty text,
.superwei-combox__selector-item text {
width: 100%;
}
.superwei-combox__selector-item:hover {
background-color: #f9f9f9;
}
.superwei-combox__selector-empty:last-child,
.superwei-combox__selector-item:last-child {
/* #ifndef APP-NVUE */
border-bottom: none;
/* #endif */
}
// picker 弹出层通用的指示小三角
.uni-popper__arrow,
.uni-popper__arrow::after {
position: absolute;
display: block;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
border-width: 6px;
}
.uni-popper__arrow {
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
top: -6px;
left: 10%;
margin-right: 3px;
border-top-width: 0;
border-bottom-color: #EBEEF5;
}
.uni-popper__arrow::after {
content: " ";
top: 1px;
margin-left: -6px;
border-top-width: 0;
border-bottom-color: #fff;
}
.superwei-combox__no-border {
border: none;
}
</style>

8
pages/store/settled/index.vue
View File

@ -244,7 +244,7 @@
</view>
</view>
<view class="item">
<!-- <view class="item">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
@ -252,12 +252,12 @@
<switch :checked="shopInfo.isVeteran" style="transform:scale(0.6)"
@change="viteran" />
</view>
<!-- <view class="acea-row row-middle">
<view class="acea-row row-middle">
<text class="tips-text" style="color: #0ca6cb;">如果为惠美乡村店铺需上传惠美乡村红头文件</text>
</view> -->
</view>
</view>
</view>
</view>
</view> -->
<!-- <view class="item" v-show="shopInfo.isVeteran">
<view class="uni-list">
<view class="uni-list-cell">

49
pages/store/settled/step3.vue
View File

@ -73,36 +73,36 @@
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name required" >银行名称</text>
<input type="text" style="text-align: right;flex:1;" maxlength="30" placeholder="请输入" v-model="shopInfo.bankName" @input="validateBtn" placeholder-class='placeholder' />
</view>
<view class="acea-row row-middle">
<text class="tips-text" >提示：请核验信息是否正确</text>
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name required" >支行名称</text>
<input type="text" style="text-align: right;flex:1;" maxlength="30" @mousedown="searchBranch" placeholder="请输入" v-model="shopInfo.bankBranchName" @input="validateBtn" placeholder-class='placeholder' />
<view>
<view class="item-name required" style="width: 220rpx;margin-bottom: 20rpx;">支行名称</view>
<!-- <input type="text" style="text-align: right;flex:1;" maxlength="30" @mousedown="searchBranch" placeholder="请输入" v-model="shopInfo.bankBranchName" @input="validateBtn" placeholder-class='placeholder' />
<view class="search-list" v-show="searchFlag">
<view class="search-tips" v-for="(item,index) in searchList" @click="selectSearch(item)">
<text>{{item.lname}}</text>
<text style="color: #999;font-size: 10px;">{{item.addr}}</text>
</view>
</view>
</view> -->
<superwei-combox :candidates="candidatesList" :isJSON="true" keyName="name_child" placeholder="请选择或输入"
v-model="shopInfo.bankBranchName" @input="bankInput" @select="bankSelect"></superwei-combox>
</view>
<view class="acea-row row-middle">
<text class="tips-text" >提示：请填写完整的支行名称（如：中国农业银行天津迎宾支行）</text>
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name required" >银行名称</text>
<input :disabled="true" type="text" style="text-align: right;flex:1;" maxlength="30" placeholder="请输入" v-model="shopInfo.bankName" @input="validateBtn" placeholder-class='placeholder' />
</view>
<view class="acea-row row-middle">
<text class="tips-text" >提示：请核验信息是否正确</text>
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name required" >联行号</text>
<input type="text" style="text-align: right;flex:1;" maxlength="30" placeholder="请输入" v-model="shopInfo.CNAPS" @input="validateBtn" placeholder-class='placeholder' />
<input :disabled="true" type="text" style="text-align: right;flex:1;" maxlength="30" placeholder="请输入" v-model="shopInfo.CNAPS" @input="validateBtn" placeholder-class='placeholder' />
</view>
<view class="acea-row row-middle">
<text class="tips-text" >提示：请核验信息是否正确</text>
@ -156,12 +156,13 @@
import { toLogin } from '@/libs/login.js';
import {queryBankCard,queryCNAPS,getAgreementApi} from '@/api/user.js';
import { configMap,throttle } from "@/utils";
import {updateGoodsRecord,create,getGoodsDetails} from '@/api/store.js';
import {updateGoodsRecord,create,getGoodsDetails,getIntentionBank} from '@/api/store.js';
import superweiCombox from '../component/superwei-combox.vue'
const app = getApp();
export default {
components: {
areaWindow,
superweiCombox
},
data() {
return {
@ -189,6 +190,7 @@
tagStyle: {
img: 'width:100%;display:block;'
},
candidatesList:[],
dataInfo:{},
mer_i_id:'',
loading:false,
@ -229,6 +231,17 @@
},
},
methods: {
bankInput(e) {
getIntentionBank({name:e}).then((res)=>{
this.candidatesList = res.data
console.log(res.data);
})
},
bankSelect(e) {
this.shopInfo.bankName = e.name
this.shopInfo.CNAPS = e.code
this.validateBtn()
},
goHome(){
uni.navigateTo({
url:'/pages/store/settled/index'

13
pages/store/shopStreet/index.vue
View File

@ -11,13 +11,13 @@
<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search" :value='sotreParam.keyword'
@confirm="searchSubmit"></input>
</view>
<view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;" class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
<!-- <view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;" class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
<view class="iconfont icon-dingwei"></view>
<view class="right-text" v-if="recommend_address">
{{recommend_address}}
</view>
<view class="iconfont icon-xiangyou" v-if="recommend_address"></view>
</view>
</view> -->
</view>
<view class="nav-wrapper" :class="'styleType'+store_street_theme">
<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
@ -266,7 +266,7 @@
this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
this.sotreParam.category_id= options.cate_id && options.cate_id.split(',').toString() || ''
this.storeList = [];
if(this.mer_location)this.selfLocation()
// if(this.mer_location)this.selfLocation()
setTimeout(()=>{
this.storeMerchantList();
},500)
@ -751,6 +751,10 @@
border: none!important;
border-radius: 0!important;
}
.txt {
// flex: 1;
max-width: 440rpx;
}
.mer-item {
margin-bottom: 20rpx;
background-color: #fff;
@ -784,9 +788,6 @@
border-radius: 50%;
margin-right: 10rpx;
}
.txt {
flex: 1;
}
}
}
/deep/.easy-loadimage{

3
pages/users/login/index.vue
View File

@ -53,8 +53,7 @@
<div class="protocol acea-row row-between-wrapper">
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
<checkbox class="checkbox" :checked="isAgree ? true : false" />
<text class="protocol_text">我已同意<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
<!-- <text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text> -->
<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
</checkbox-group>
</div>
<!-- #ifdef APP-PLUS -->

34
pages/users/order_confirm/index.vue
View File

@ -402,17 +402,29 @@
<view class='money'>-￥{{coupon_price}}</view>
</view>
<view class='item acea-row row-between-wrapper' v-if="open_integral && userInfo.integral>0 && order_type == 0">
<view>铸源星支付：</view>
<view>铸源星抵扣：</view>
<view class='money'>
<text v-if="!use_integral">当前铸源星<text class="pColor">{{userInfo.integral}}</text></text>
<text v-else>使用了{{integral_count}}个铸源星，抵扣<text
class="pColor">{{integral_price}}元</text></text>
<view class="checkbox integral_checked" @click="changeIntegral">
<view class="checkbox integral_checked" @click="changeIntegral('use')">
<view class="iconfont icon-weixuanzhong" v-if="!use_integral"></view>
<view class='iconfont icon-xuanzhong1' v-else></view>
</view>
</view>
</view>
<view class='item acea-row row-between-wrapper' v-if="userInfo.now_money>0">
<view>抵扣卷抵扣：</view>
<view class='money'>
<text v-if="!now_integral">当前抵扣卷<text class="pColor">{{userInfo.now_money}}</text></text>
<text v-else>使用了{{use_count}}个抵扣卷，抵扣<text
class="pColor">{{use_amount}}元</text></text>
<view class="checkbox integral_checked" @click="changeIntegral('now')">
<view class="iconfont icon-weixuanzhong" v-if="!now_integral"></view>
<view class='iconfont icon-xuanzhong1' v-else></view>
</view>
</view>
</view>
<view class='item acea-row row-between-wrapper'
v-if="order_type != 3 && order_type != 4 && enabledPlatformCoupon">
<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
@ -557,7 +569,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
"name": "消费券支付",
"name": "余额支付",
"icon": "icon-icon-test",
value: 'balance',
title: '可用余额:',
@ -629,6 +641,7 @@
coupon_price: 0, //优惠券抵扣金额
useIntegral: false, //是否使用铸源星
integral_price: 0, //铸源星抵扣金额
use_amount: 0, //抵扣卷抵扣金额
integral: 0,
status: 0,
is_address: false,
@ -640,6 +653,7 @@
animated: false,
totalPrice: 0,
use_integral: false,
now_integral: false,
pagesUrl: "",
orderKey: "",
offlinePostage: "",
@ -669,6 +683,7 @@
store_coupon_amount: 0,
plant_coupon_amount: 0,
integral_count: '',
use_count: '',
agrementTtile: '发票说明',
pics: [],
order_model: 2,
@ -793,7 +808,12 @@
this.isAgree = !this.isAgree;
},
changeIntegral: function(e) {
this.use_integral = !this.use_integral;
console.log(e);
if(e=='use'){
this.use_integral = !this.use_integral;
}else{
this.now_integral = !this.now_integral;
}
this.getConfirm(this.addressId);
},
showPresellAgree(){
@ -1065,7 +1085,8 @@
address_id: address_id,
takes: that.take,
use_coupon: that.subCoupon,
use_integral: that.use_integral
use_integral: that.use_integral,
use_amount:that.now_integral
}).then(res => {
// 默认选中
that.is_take = false
@ -1102,7 +1123,9 @@
that.$set(that, 'order_type', res.data.order_type);
that.$set(that, 'coupon_price', res.data.order_coupon_price);
that.$set(that, 'integral_count', res.data.order_total_integral);
that.$set(that, 'use_count', res.data.order_total_amount);
that.$set(that, 'integral_price', res.data.order_total_integral_price);
that.$set(that, 'use_amount', res.data.order_total_amount_price);
that.$set(that, 'open_integral', res.data.openIntegral);
that.$set(that, 'use_integral', res.data.useIntegral);
that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length>0) ? that.order_extend : res.data.order_extend);
@ -1681,6 +1704,7 @@
key: this.order_key,
takes: this.take,
use_integral: this.use_integral,
use_amount:this.now_integral,
receipt_data: this.invoiceData,
extend: this.extend,
post: this.post,

4
pages/users/order_list/index.vue
View File

@ -307,7 +307,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "消费券支付",
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
@ -315,7 +315,7 @@
payStatus: this.$store.getters.globalData.yue_pay_status
},
{
name: "铸源星支付",
name: "铸源星抵扣",
icon: "haiyuefont haiyue-jifenduihuan",
value: 'integral',
title: '可用铸源星:',

2
pages/users/order_list/search.vue
View File

@ -255,7 +255,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "消费券支付",
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',

2
pages/users/presell_order_list/index.vue
View File

@ -107,7 +107,7 @@
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "消费券支付",
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',

4
pages/users/real_name_authentication/index.vue
View File

@ -13,7 +13,7 @@
<input type="text" v-model="number" placeholder="请输入身份证号码"/>
</view>
</view>
<view class="title">
<!-- <view class="title">
证件
</view>
<view class="photo-items">
@ -57,7 +57,7 @@
</view>
</view>
</view>
</view> -->
<view class="btn" @click="submitReal">
提交认证
</view>

4
pages/users/user_info/index.vue
View File

@ -70,13 +70,13 @@
<text class='iconfont icon-suozi'></text>
</view>
</view>
<view class='item acea-row row-between-wrapper'>
<!-- <view class='item acea-row row-between-wrapper'>
<view>ID号</view>
<view class='input acea-row row-between-wrapper'>
<input type='text' :value='userInfo.uid' disabled='true' class='id'></input>
<text class='iconfont icon-suozi'></text>
</view>
</view>
</view> -->
<view class='item acea-row row-between-wrapper'>
<view>手机号码</view>
<navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">

4
pages/users/user_invoice_order/index.vue
View File

@ -81,12 +81,12 @@
<view class='conter'>￥{{orderInfo.coupon_price}}</view>
</view>
<view v-if="orderInfo.integral_price > 0" class='item acea-row row-between'>
<view>铸源星支付：</view>
<view>铸源星抵扣：</view>
<view class='conter'>￥{{orderInfo.integral_price}}</view>
</view>
<view class='item acea-row row-between'>
<view>支付方式：</view>
<view class='conter' v-if="orderInfo.pay_type==0">消费券支付</view>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
</view>