yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单

This commit is contained in:
Mr.jiang 2024-07-10 15:32:28 +08:00
parent 5c14d7c09c
commit 01a5b43457
14 changed files with 180 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/config.js
View File

@ -2,9 +2,9 @@
// const ROOTPATH1 = "http://120.46.52.165/sqx_fast";
// const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/";
// const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/";
// const ROOTPATH = "http://192.168.2.222:8187/sqx_fast";
// const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast";
// const ROOTPATH3 = "wss://192.168.2.15:8187/wss/websocket/";
// const ROOTPATH = "http://192.168.2.15:8187/sqx_fast";
// const ROOTPATH1 = "http://192.168.2.15:8187/sqx_fast";
// const ROOTPATH3 = "wss://1.92.152.160/wss/websocket/";
// const ROOTPATH = "http://1.92.152.160/sqx_fast";
@ -57,7 +57,7 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6';
//ws基础连接地址
// const WS_BASE_PATH = 'ws://47.75.182.93:8090/sqx_fast/';
// const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/';
// const WS_BASE_PATH = 'ws://192.168.2.15:8187/sqx_fast/';
const WS_BASE_PATH = 'ws://sausers.blxinchuang.com/sqx_fast/';
// const WS_BASE_PATH = 'ws://1.92.152.160/sqx_fast/';
// const WS_BASE_PATH = 'ws://120.46.52.165/sqx_fast/';

4
common/queue.js
View File

@ -20,7 +20,7 @@ module.exports = {
publicYuMing() {
// return 'https://admin.sjajk.com'//生产需替换
// return 'http://120.46.52.165'1.92.152.160
// return 'http://192.168.2.222:8187'
// return 'http://192.168.2.15:8187'
return 'https://sausers.blxinchuang.com'
// return 'http://1.92.152.160'
// return 'http://47.75.182.93:8090:8187'
@ -31,7 +31,7 @@ module.exports = {
// return 'http://120.46.52.165'
return 'https://sausers.blxinchuang.com'
// return 'http://1.92.152.160'
// return 'http://192.168.2.222:8187'
// return 'http://192.168.2.15:8187'
// return 'http://47.75.182.93:8090:8187'
},
logout() {

2
my/order/payModifyDd.vue
View File

@ -684,7 +684,7 @@
// that.showpay = true;
that.paySel = 1;
uni.navigateTo({
url:'/my/order/paydingDd?ordersId='+ res.data.ordersId
url:'/my/order/payding?ordersId='+ res.data.ordersId
})
} else {
that.$queue.showToast(res.msg)

4
package/pages/zysc/my/myList.vue
View File

@ -14,7 +14,7 @@
</scroll-view>
</view>
<!-- #ifdef H5 -->
<view style="margin-top: 100upx;" v-if="newsList.length > 0">
<view style="margin-top: 50px;" v-if="newsList.length > 0">
<!-- #endif -->
<!-- #ifndef H5 -->
<view style="margin-top: 20upx;padding-top: 60rpx;" v-if="newsList.length > 0">
@ -409,7 +409,7 @@
/* #endif */
/* #ifdef H5 */
position: fixed;
top: 44px;
top: 0;
left: 0;
z-index: 999;
/* #endif */

30
pages/cooperate/hehuo.vue
View File

@ -62,9 +62,9 @@
<view class="adv-xian"></view>
<view class="adv_lines">
<view>备注</view>
<textarea v-model="beizhu" name="" id="" cols="30" rows="10" placeholder="请输入备注~~~~"></textarea>
<textarea style="height: 100px;" v-model="beizhu" name="" maxlength="100" id="" cols="30" rows="10" placeholder="请输入备注~~~~"></textarea>
</view>
<view class="adv-xian"></view>
</view>
<view class="usermain-btn" @tap="save">提交申请</view>
</view>
@ -98,11 +98,11 @@
checked: 'true'
},
{
value: '200',
value: '50到200平米',
name: '50到200平米'
},
{
value: '平米以上',
value: '200平米以上',
name: '200平米以上'
},
],
@ -121,7 +121,7 @@
name: '15-20人'
},
{
value: '人以上',
value: '20人以上',
name: '20人以上'
},
],
@ -147,8 +147,22 @@
xiangmuData:'',
}
},
mounted() {
},
methods: {
save() {
if(!this.mendianData){
this.mendianData=this.jingying[0].value
}
if(!this.mianjiData){
this.mianjiData=this.mianji[0].value
}
if(!this.tuanduiData){
this.tuanduiData=this.tuandui[0].value
}
if(!this.xiangmuData){
this.xiangmuData=this.xiangmu[0].value
}
if (this.userName === '') {
this.$queue.showToast('请输入姓名')
return;
@ -256,9 +270,10 @@
margin-top: 180rpx;
/* #endif */
}
/deep/.uni-textarea-textarea{
.uni-textarea-compute{
}
/deep/.uni-textarea-textarea{
border-radius: 8rpx;
margin-top: 20rpx;
}
@ -328,6 +343,7 @@
border-radius: 10px;
padding: 20px;
margin-top: 20rpx;
margin-bottom: 50px;
}
.send-msg{
padding: 0 30rpx;

2
pages/cooperate/index.vue
View File

@ -4,7 +4,7 @@
<view class="cooperate-line" @click="goNav('/pages/my/hehuo')">
<image class="cooperate-img" src="../../static/cooperate/cooperate1.png" mode=""></image>
</view>
<view class="cooperate-line" @click="goNav('/pages/cooperate/hehuocity')">
<view class="cooperate-line" @click="goNav('/pages/my/cooperation')">
<image class="cooperate-img" src="../../static/cooperate/cooperate2.png" mode=""></image>
</view>
<view class="cooperate-line" @click="goNav('/pages/cooperate/hehuo')">

16
pages/index/index.vue
View File

@ -101,7 +101,7 @@
<image class="index-guanggao-pintuan" @click="qidai()" src="../../static/pintuan.png" mode="widthFix"></image>
<view class="index-guanggao-right">
<image class="index-guanggao-right-cika index-interval" @click="goNav('/pages/my/indextaociliaoList?type='+105+'&name='+'index')" src="../../static/cika.png" mode="widthFix"></image>
<image class="index-guanggao-right-yuyue" @click="qidai()" src="../../static/yuyue.png" mode="widthFix"></image>
<image class="index-guanggao-right-yuyue" @click="yuedao('企业')" src="../../static/yuyue.png" mode="widthFix"></image>
</view>
</view>
<view class="index-fujin">
@ -127,7 +127,6 @@
<view class="index-fujin-jie">
<view class="index-fujin-jie-view">
<span class="index-fujin-jie-name">{{item.artificerName}}</span>
<!-- <span class="index-fujin-jie-id">{{item.content}}</span> -->
</view>
</view>
</view>
@ -240,6 +239,10 @@
</view>
<view class="popup-mian">
<view class="popup-mian-view">
<view class="index-project-content" @click="yuedao('商家')">
<image src="../../static/index-fenglei9.png" mode="widthFix"></image>
<span class="feng_word">约到店</span>
</view>
<view class="index-project-content">
<image src="../../static/index-fenglei8.png" mode="widthFix"></image>
<span class="feng_word">美甲师</span>
@ -248,10 +251,7 @@
<image src="../../static/index-fenglei8.png" mode="widthFix"></image>
<span class="feng_word">美容师</span>
</view>
<view class="index-project-content" @click="yuedao()">
<image src="../../static/index-fenglei9.png" mode="widthFix"></image>
<span class="feng_word">约到店</span>
</view>
</view>
<!-- <view class="popup-mian-btn">
@ -530,9 +530,9 @@
url:'/package/pages/zysc/index/index'
})
},
yuedao(){
yuedao(text){
uni.navigateTo({
url:'/pages/shop/index'
url:'/pages/shop/index?text='+text
})
},
closePopup(type){//提前结束 关闭弹出框

11
pages/my/cooperation.vue
View File

@ -14,7 +14,7 @@
<view class="line"></view>
<view class="info-box-item">
<view class="info-box-item-name">地址</view>
<u-input placeholder="请选择所在区域地址" v-model=" applyContent" @click="getcity()" :disabled="true"
<u-input placeholder="请选择所在区域地址" @click="getcity()" v-model="applyContent" :disabled="true"
:clearable="false">
</u-input>
</view>
@ -39,7 +39,9 @@
applyName: '',
applyPhone: '',
applyContent: '',
applyId: ''
applyId: '',
latitude:'',
longitude:''
};
},
onLoad() {
@ -63,7 +65,6 @@
})
},
getcity() {
// console.log(55555)
let that = this
uni.chooseLocation({
success: function(res) {
@ -71,6 +72,10 @@
console.log('详细地址：' + res.address);
console.log('纬度：' + res.latitude);
console.log('经度：' + res.longitude);
that.latitude = res.latitude
that.longitude = res.longitude
uni.setStorageSync('latitude', res.latitude)
uni.setStorageSync('longitude', res.longitude)
that.applyContent = res.address + res.name
}
});

2
pages/my/index.vue
View File

@ -9,7 +9,7 @@
<view class="my-head-top-view" v-if="!isLogin">
<view class="my-head-top-text">
<span>{{userName}}</span>
<view class="my-head-top-id">
<view class="my-head-top-id" v-if="vipNameType">
<image v-if="vipNameType=='0'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership5.png"></image>
<image v-if="vipNameType=='1'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership6.png"></image>
<image v-if="vipNameType=='2'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership4.png"></image>

94
pages/shop/index.vue
View File

@ -4,10 +4,10 @@
<view class="service-head-top">
<view class="service-head-top-left">
<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
<span>商家</span>
<span>{{getText}}</span>
</view>
<view>
<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
<uni-search-bar @service="serviceTrue" :cancelext="'取消'" v-model="searchValue" @input="input"
@clear="clear">
</uni-search-bar>
<view class="search-btn" @click="searchBtn">
@ -17,34 +17,32 @@
</view>
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
<template slot="content">
<view>
<view v-if="getText=='企业'">
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
<image :src="item.packageImg" mode="" class="item-img"></image>
<image :src="item.massageImg" mode="" class="item-img"></image>
<view class="item-view">
<view class="view-cata">
<view class="item-view-title">{{item.title}}门店名称</view>
<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
</view>
<!--<view class="item-view-bottom-qian">
<view class="item-view-bottom-qian">
<span>￥</span>
<span>{{item.price}}</span>
<span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text> {{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
<span>￥</span>
<span>{{item.oldPrice}}<text v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
<span style="color: #999;text-decoration: line-through;margin-left: 5px;">￥{{item.oldPrice}}</span>
</view>
<view class="item-view-jianjie">
{{item.content}}
</view>-->
<!--<view class="item-view-bottom">
</view>
<view class="item-view-bottom">
<view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}}w+</span> | 好评{{item.esteemRate}}%
<span>已售</span><span>{{item.sales}}w+</span>
</view>
<view class="item-view-bottom-btn">
查看
预约
</view>
</view>-->
<view class="flex shop_category">
</view>
<!-- <view class="flex shop_category">
<view class="shop_category_a">中医理疗</view>
<view>6.7km</view>
</view>
@ -53,10 +51,10 @@
<span>有吸烟区</span>
<span>有淋浴房</span>
<span>有免费wifi</span>
</view>
</view> -->
</view>
</view>
<view class="shop_item">
<!-- <view class="shop_item">
<view>
<span>￥</span>
<span class="shop_color">980</span>
@ -64,8 +62,32 @@
</view>
<view>【冬病夏治】无烟明火艾灸疗</view>
<view class="shop-arrow"></view>
</view> -->
</view>
<view v-if="getText=='商家'">
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
<image :src="item.logo" mode="" class="item-img"></image>
<view class="item-view">
<view class="view-cata">
<view class="item-view-title">{{item.consortiaName}}</view>
</view>
<view class="item-view-jianjie">
{{item.consortiaContent}}
</view>
<view class="shop_label" v-if="tagsData">
<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
</view>
<view class="item-view-bottom">
<view class="item-view-bottom-btn">
预约
</view>
</view>
</view>
</view>
</view>
<empty v-if="dataList.length==0"></empty>
</template>
</t-refresh>
@ -93,11 +115,14 @@
titleNmae:'',
classifyId:'',
getName:'',
getText:'',
tagsData:[]
}
},
onLoad(e){
this.typeData=e.type
this.getName=e.name;
this.getText=e.text
this.myId = uni.getStorageSync('userId')
this.getData()
},
@ -131,8 +156,9 @@
},
getData(){
var that=this;
that.$Request.get("/app/massage/package/findPage", {
type:that.typeData,
if(that.getText=='企业'){
that.$Request.get("/app/artificer/selectMassageTypeQyPage", {
city:'长春',
page:that.page,
limit:that.limit,
title:that.searchValue
@ -145,6 +171,25 @@
}
}
});
}else{//约到店
that.$Request.get("/app/consortia/selectConsortiaList", {
page:that.page,
limit:that.limit,
title:that.searchValue
}).then(res => {
if (res.code == 0) {
if (res.data) {
if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
for(var i=0;i<this.dataList.length;i++){
this.tagsData=this.dataList[i].tags.split(',');
}
uni.stopPullDownRefresh()
}
}
});
}
},
backImg(){//返回上一页
uni.reLaunch({
@ -155,21 +200,16 @@
this.getData()
},
itemClick(item) {
if(this.typeData=='104'){
if(this.getText=='企业'){
uni.navigateTo({
url:'/pages/my/serviceOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
url:'/pages/my/fuwuDateil?id='+item.massageTypeId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
})
}else if(this.typeData=='105'){
}else{
uni.navigateTo({
url:'/pages/my/cikarDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
})
}else if(this.typeData=='106'){
uni.navigateTo({
url:'/pages/my/fuwuliaochengDetail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
url:'/pages/shop/yueDaoDianDrtail?id='+item.consortiaId
})
}
}
}
}

617
pages/shop/yueDaoDianDrtail.vue
View File

@ -2,26 +2,26 @@
<view class="content">
<view class="header">
<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
</view>
<view class="header-bottom">
<view class="header-bottom-top">
<view class="header-bottom-title">
<view class="header-bottom-title-text">
<span>灸之道古法艾灸</span>
<span>{{mainData.consortiaName}}</span>
</view>
</view>
<view class="shop_label">
<span>有包厢</span>
<span>有吸烟区</span>
<span>有淋浴房</span>
<span>有免费wifi</span>
<view class="shop_label" v-if="labels">
<span v-for="(item,index) in labels" :key="index">{{item}}</span>
</view>
<view class="item-view-jianjie">
{{mainData.consortiaContent}}
</view>
<view class="header-bottom-money-view">
<view class="shop-bottom-money1">
<image src="../../static/clock.png" class="shop-img"></image><span class="shop-bottom-text">营业中</span>
<view><span>营业时间：</span><span>周一至周日</span><span>09:30-21:30</span></view>
<view><span>营业时间：</span><span>{{mainData.yysj}}</span></view>
<!-- <view><span>营业时间：</span><span>周一至周日</span><span>09:30-21:30</span></view> -->
</view>
</view>
</view>
@ -31,97 +31,25 @@
<view class="shop-tis">经营资质备案</view>
<view class="view-more"></view>
</view>
<!-- <view class="detail-foot">
<view class="detail-foot-nav">
<span class="detail-foot-nav-text">适用说明</span>
<span class="detail-foot-nav-bor"></span>
</view>
<view class="detail-foot-mian detail-pad">
<view class="detail-foot-mian-top">
<span class="detail-foot-mian-top-title">性别限制: </span>
<span class="detail-foot-mian-top-text">不限性别</span>
</view>
<view class="detail-foot-mian-top-bottom">
<span class="detail-foot-mian-top-title">适应人群: </span>
<span class="detail-foot-mian-top-text">
{{mainData.applyPeople}}
</span>
</view>
</view>
</view> -->
<view class="detail-foot">
<view class="detail-foot-nav">
<span class="detail-foot-nav-text">项目详情</span>
<span class="detail-foot-nav-text">资质证书</span>
<span class="detail-foot-nav-bor"></span>
</view>
<view class="detail-foot-mian detail-pad">
<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>
<!-- <view class="lab-view">
<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
<span class="detail-foot-mian-txetList">{{item}}</span>
</view>
</view> -->
<image class="detail-foot-mian-img" v-for="(item,index) in qualificationCertificate" :key="index" :src="item" mode="widthFix"></image>
</view>
</view>
<view class="detail-foot" v-if="dataList.name=='my'">
<view class="detail-foot">
<view class="detail-foot-nav">
<span class="detail-foot-nav-text">次卡详情</span>
<span class="detail-foot-nav-text">营业执照</span>
<span class="detail-foot-nav-bor"></span>
</view>
<view class="detail-foot-mian1">
<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index">
<view class="detail-foot-list-top">
<span style="margin-right: 5px;">{{item.title}}</span>
<!-- <span style="display: none;">详情</span>
<span>服务时长:{{item.duration}}分钟</span> -->
</view>
<view class="header-bottom-money">
<view class="header-bottom-money-zhen">
已使用{{item.usedQuantity}}次
</view>
<view class="dingdan-btn" @click="detail(item)" :class="[item.usedQuantity=='0'?'dingdan-btn-h':'dingdan-btn-l']">
订单详情
</view>
</view>
<view class="header-bottom-money" style="margin-top: 5px;">
<view class="header-bottom-money-zhen">
未使用{{item.unUsedQuantity}}次
</view>
<view class="dingdan-btn" @click="goumai(item)" :class="[item.unUsedQuantity=='0'?'dingdan-btn-h':'dingdan-btn-l']">
立即预约
</view>
</view>
<view class="detail-foot-title">
项目次卡
</view>
</view>
<view class="detail-foot-mian detail-pad">
<image class="detail-foot-mian-img" v-for="(item,index) in businessLicense" :key="index" :src="item" mode="widthFix"></image>
</view>
</view>
<!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
<view class="popup_pay">
<view style="background-color: #fff;">
<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;display: flex;flex-direction: column;justify-content: center;">
<view
style="width:92%;display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
v-for="(item,index) in openLists" :key='item.id'>
<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
</image>
<view style="font-size: 30upx;margin-left: 20upx;width: 70%;">
{{item.text}}
</view>
<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
<label class="tui-radio">
<radio color="#096f4b" :checked="openWay === item.id ? true : false" />
</label>
</radio-group>
</view>
</view>
</view>
<view class="pay_btn" @click="pay()">确认支付</view>
</view>
</u-popup>
</view>
</template>
<script>
@ -145,7 +73,9 @@
tpayMoney: '',
mainId:'',
serviceCount:'',
labels:[]
labels:[],
businessLicense:[],
qualificationCertificate:[]
}
},
computed: {
@ -161,512 +91,47 @@
that.dataList=e;
that.isVIP=this.$queue.getData('isVIP');
that.getData()
that.youhui()
},
onShow() {
// #ifndef MP-WEIXIN
this.openLists = [{
image: '../../static/images/icon_weixin.png',
text: '微信支付',
id: 2
}, {
image: '../../static/images/zhifubao.png',
text: '支付宝支付',
id: 3
}, {
image: '../../static/images/lingqian.png',
text: '零钱支付',
id: 1
}],
this.openWay = 2;
// #endif
// #ifdef MP-WEIXIN
this.openLists = [{
image: '../../static/images/icon_weixin.png',
text: '微信支付',
id: 2
}, {
image: '../../static/images/lingqian.png',
text: '零钱支付',
id: 1
}],
this.openWay = 2;
// #endif
},
methods:{
detail(item){//详情
console.log("item=====>",item)
if(item.usedQuantity){
item.id=this.mainData.id
uni.navigateTo({
url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'次卡'
})
}else{
uni.showToast({
icon:'error',
title:'项目次卡尚未使用，无订单信息！'
})
}
},
goumai(item){//立即购买
if(item.unUsedQuantity>'0'){
uni.navigateTo({
url:'/pages/my/myCiLiaoDetail?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
})
}else{
uni.showToast({
icon:'error',
title:'项目次卡已使用完成，无订单信息！'
})
}
},
goNav(e) {
uni.navigateTo({
url: e
})
},
payJZ() {
let that = this;
if (that.openWay == 1) { //零钱支付
uni.showModal({
title: '付款提示',
content: '确认支付' + that.tpayMoney + '元吗?',
success: function(re) {
if (re.confirm) {
that.$queue.showLoading('支付中...')
// console.log('用户点击确定');
that.$Request.post("/app/user/package/order/payOrder", {
ordersId: that.tordersId,
}).then(ret => {
uni.hideLoading();
if (ret.code == 0) {
uni.showToast({
title: '支付成功',
icon: 'none'
})
that.getData()
} else {
uni.showToast({
title: ret.msg,
icon: 'none'
})
}
});
} else if (re.cancel) {
}
}
})
} else if (that.openWay == 2) { //微信支付
// #ifdef MP-WEIXIN
let data = {
ordersId: that.tordersId,
type: 3
}
that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
console.log(ret)
if (ret.code == 0) {
uni.hideLoading();
uni.requestPayment({
provider: 'wxpay',
timeStamp: ret.data.timestamp,
nonceStr: ret.data.noncestr,
package: ret.data.package,
signType: ret.data.signType,
paySign: ret.data.sign,
success: function(ret) {
console.log(ret)
uni.showToast({
title: '支付成功',
icon: 'none'
})
that.getData()
// this.$queue.showToast('支付成功');
// uni.switchTab({
// url: '/pages/my/index'
// })
},
fail: function(err) {
// this.$queue.showToast('支付失败');
uni.showToast({
title: '支付失败',
icon: 'nones'
});
}
});
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
let data = {
ordersId: that.tordersId,
type: 2
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
that.showpay = false
if (rea.code == 0) {
that.callPay(rea.data);
that.getData()
} else {
uni.showToast({
title: rea.msg,
icon: 'none'
})
}
});
} else {
let data = {
ordersId: that.tordersId,
type: 4
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
that.showpay = false
if (rea.code == 0) {
const urlArr = window.location.href;
const hostUrl = urlArr.split("/");
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url
that.getData()
} else {
uni.showToast({
title: rea.msg,
icon: 'none'
})
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
type: 1
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
console.log(rea)
that.showpay = false
if (rea.code == 0) {
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}
});
// #endif
} else if (that.openWay == 3) { //支付宝支付
// #ifdef H5
let data = {
ordersId: that.tordersId,
type: 2
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
that.showpay = false
const div = document.createElement('div')
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div)
document.forms[0].submit()
that.getData()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.tordersId,
type: 1
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
that.showpay = false
that.setPayment('alipay', rea.data);
that.getData()
});
// #endif
}
},
// 支付订单
pay() {
let that = this
this.showpay = false
if (this.paySel != 0) {
this.payJZ();
return;
}
if (that.openWay == 1) { //零钱支付
uni.showModal({
title: '付款提示',
content: '确认支付' + that.order.payMoney + '元吗?',
success: function(re) {
if (re.confirm) {
that.$queue.showLoading('支付中...')
console.log('用户点击确定');
that.$Request.post("/app/user/package/order/payOrder", {
ordersId: that.order.ordersId,
}).then(res => {
uni.hideLoading();
if (res.code == 0) {
uni.showToast({
title: '支付成功'
})
that.getData()
} else {
uni.showToast({
title: res.msg,
icon: 'none'
})
}
});
} else if (re.cancel) {
uni.hideLoading();
console.log('用户点击取消');
}
}
})
} else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...')
// #ifdef MP-WEIXIN
let data = {
ordersId: that.order.ordersId,
type: 3
}
that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
console.log(ret)
if (ret.code == 0) {
uni.hideLoading();
uni.requestPayment({
provider: 'wxpay',
timeStamp: ret.data.timestamp,
nonceStr: ret.data.noncestr,
package: ret.data.package,
signType: ret.data.signType,
paySign: ret.data.sign,
success: function(ret) {
console.log(ret)
uni.showToast({
title: '支付成功',
icon: 'none'
})
that.getData()
// this.$queue.showToast('支付成功');
// uni.switchTab({
// url: '/pages/my/index'
// })
},
fail: function(err) {
// this.$queue.showToast('支付失败');
uni.showToast({
title: '支付失败',
icon: 'nones'
});
}
});
}
});
// #endif
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
let data = {
ordersId: that.order.ordersId,
type: 2
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
that.showpay = false
if (rea.code == 0) {
that.callPay(rea.data);
that.getData()
} else {
uni.showToast({
title: rea.msg,
icon: 'none'
})
}
});
} else {
let data = {
ordersId: that.order.ordersId,
type: 4
}
// debugger;
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
// const urlArr = window.location.href;
// const hostUrl = urlArr.split("/");
// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
// const url = '&redirect_url=' + callBack + 'my/order/pay';
// window.location = rea.mweb_url + url
that.showpay = false
if (rea.code == 0) {
const urlArr = window.location.href;
const hostUrl = urlArr.split("/");
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url
that.getData()
} else {
uni.showToast({
title: rea.msg,
icon: 'none'
})
}
});
}
// #endif
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
type: 1
}
that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
console.log(rea)
that.showpay = false
if (rea.code == 0) {
that.getData()
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}
});
// #endif
} else if (that.openWay == 3) { //支付宝支付
that.$queue.showLoading('支付中...')
// #ifdef H5
let data = {
ordersId: that.order.ordersId,
type: 2
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
const div = document.createElement('div')
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div)
document.forms[0].submit()
that.getData()
});
// #endif
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
type: 1
}
that.$Request.post('/app/aliPay/payOrder', data).then(
rea => {
that.setPayment('alipay', rea.data);
that.getData()
});
// #endif
}
},
openpay(item) {//立即预约
this.$queue.setData('mainData',item)
this.$queue.setData('detailData',this.detailData)
this.$queue.setData('xiangmu',item)
this.$queue.setData('youhui','');
uni.navigateTo({
url:'/my/order/payModifyCi?ordersId='+item.id
})
// this.goOrder()
// this.showpay = true
},
//支付选择
selectWay: function(item) {
this.openWay = item.id;
},
goOrder() {//生成orderId
let that = this
console.log('asdasd',that.couponId)
// let payMoney =item.price;
// let payMoney = that.isVip ? item.memberPrice : item.price;
let data = {
userId: uni.getStorageSync('userId'),
couponId: that.couponId,
oldSumMoney: that.mainData.oldPrice*that.detailData.length,
sumMoney: that.mainData.price*that.detailData.length,
ordersPackageList:[
{packageId: that.mainData.id,num: 1},
]
}
that.$Request.postJson("/app/user/package/order/insertOrders", data).then(res => {
that.showorder = false
if (res.code == 0) {
that.tordersId = res.data.ordersId;
that.tpayMoney = res.data.payMoney;
that.showpay = true;
that.paySel = 1;
} else {
that.$queue.showToast(res.msg)
}
});
},
checkboxChange(e){
this.couponId=e.detail.value.join(",")
},
youhui(){//获取优惠卷
let that = this
let data = {
status: 0,
page: 1,
limit: 10
}
that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
if (res.code == 0) {
that.couponData=res.data.list
} else {
that.$queue.showToast(res.msg)
}
});
},
getData(){
var that=this;
if(that.dataList.name=='index'){
let data = {
mainId: that.dataList.id,
page: that.dataList.page,
limit: that.dataList.limit,
}
that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
if (res.code == 0) {
that.mainData=res.mainData;
that.contentImg=that.mainData.contentImg.split(",");
that.detailData=res.detailData.list;
that.backgroundImageUrl=that.mainData.packageImg;
that.serviceCount=that.detailData[0].serviceCount;
that.labels=that.mainData.labels.split(',');
let data = {
consortiaId: that.dataList.id,
}
})
}else{
let data = {
mainId: that.dataList.id,
page: that.dataList.page,
limit: that.dataList.limit,
}
that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => {
if (res.code == 0) {
that.mainData=res.data.mainData;
that.contentImg=that.mainData.contentImg.split(",");
that.detailData=res.data.detailData;
that.mainId=that.mainData.id;
that.backgroundImageUrl=that.mainData.packageImg;
that.labels=that.mainData.labels.split(',');
}
})
}
that.$Request.get('/app/consortia/selectConsortiaByUserId', data).then(res => {
if (res.code == 0) {
that.mainData=res.data;
that.qualificationCertificate=that.mainData.qualificationCertificate.split(",");
that.businessLicense=that.mainData.businessLicense.split(",");
that.backgroundImageUrl=that.mainData.logo;
that.labels=that.mainData.tags.split(',');
}
})
},
}
}
</script>
<style scoped>
.item-view-jianjie{
font-weight: 400;
font-size: 24rpx;
color: #999999;
margin:5px 0px;
/* display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
text-overflow: ellipsis; */
}
.lab-view{
width:100%;
display: flex;

13
pages/therapist/orderDetail.vue
View File

@ -4,10 +4,11 @@
<view class="swiperBac">
<swiper style="height: 745.83rpx;" autoplay="1500" :indicator-dots="false" :circular='true'
indicator-active-color="#ffffff" indicator-color="#cccccc">
<swiper-item class="" :style="{backgroundImage:item,}" v-for="(item,index) in order.lifePhoto"
<swiper-item class="swiper-img" :style="{backgroundImage:item,}" v-for="(item,index) in order.lifePhoto"
:key='index' @click="saveImgs(order.lifePhoto,index)">
<image class="swiper-image" :src="item" mode="aspectFit" style="height: 100%;">
</image>
<view class="xiangshi" v-if="order.bdxsl">相识度：{{order.bdxsl}}%</view>
</swiper-item>
</swiper>
</view>
@ -629,6 +630,16 @@
</script>
<style scoped>
.xiangshi{
padding: 5px;
background-color: rgba(0, 0, 0, 0.1);
position: absolute;
bottom: 0;
margin-bottom: 20px;
}
.swiper-img{
position: relative;
}
.jianjie-title{
padding: 0px !important;
text-align: left;

9
uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
View File

@ -6,6 +6,7 @@
<image style="border-radius: 7px;" :src="item.artificerImg" :style="'width:'+imgWidth+'px;'+'height:'+imgHeight+'px;'" mode=""></image>
<view class="item-name">{{item.artificerName}}</view>
<view class="item-descr">{{item.content}}</view>
<!-- <view class="xiangshi" v-if="item.bdxsl">相识度：{{item.bdxsl}}%</view> -->
</view>
</scroll-view>
</view>
@ -50,6 +51,13 @@
}
</style>
<style scoped>
.xiangshi{
padding: 5px;
background-color: rgba(0, 0, 0, 0.1);
position: absolute;
bottom: 0;
margin-bottom: 54px;
}
.subtitle {
padding: 16rpx 32rpx;
font-size: 32rpx;
@ -72,6 +80,7 @@
margin-right: 10px;
border-radius: 10px;
margin-top: 10px;
position: relative;
/* border: 4rpx solid #FFFFFF;
box-shadow: 0px 4rpx 8rpx 0px rgba(0, 0, 0, 0.1);
text-align: center; */

2
uview-ui/libs/request/index.js
View File

@ -102,7 +102,7 @@ class Request {
constructor() {
this.config = {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
// baseUrl: 'http://192.168.2.222:8187/',
// baseUrl: 'http://192.168.2.15:8187/',
baseUrl: 'https://sausers.blxinchuang.com/', // 请求的根域名
// baseUrl: 'http://1.92.152.160/', // 请求的根域名
// baseUrl: 'http://120.46.52.165/', // 请求的根域名