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

Compare commits

base: yangjun:72ea63d67d8dff2a4dfd00595538de52f65ddccb
Branches Tags
yangjun:master
..
compare: yangjun:65b257c933667e5d29f5b6918912c32e2d7cc3a2
Branches Tags
yangjun:master

2 Commits
72ea63d67d ... 65b257c933

Author SHA1 Message Date
yangjun 65b257c933 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi 2024-07-01 22:17:15 +08:00
yangjun d1ecd1c0b4 修改购买物料包功能 2024-07-01 22:17:10 +08:00
2 changed files with 29 additions and 20 deletions
Show Stats Expand all files Collapse all files

7
package/pages/zysc/member/order.vue
View File

@ -40,13 +40,14 @@
</view>
</view>
<view style="display: flex;">
<view
<!-- <view
:style="checkString != '' ? 'display: flex;width: 70%;margin-top: 10upx;' : 'display: flex;width: 70%;margin-top: 30upx;'">
<view style="font-size: 30upx;color: #333333;margin-top: 25upx;">¥ {{money}}</view>
<view style="font-size: 20upx;color: #666666;margin-top: 30upx;margin-left: 15upx;">
x{{number}}</view>
</view>
<view v-if="isExpress === 1 && className === '' && checkString == '' "
</view> -->
<!-- <view v-if="isExpress === 1 && className === '' && checkString == '' " -->
<view
style="width:200upx;height: 60upx;display: flex;margin-top: 30upx;border-radius: 5upx;border:1px solid #E6E6E6;">
<view
style="border-right:1px solid #E6E6E6;width: 70upx;color: #999999;text-align: center;margin-top: 15upx;"

24
pages/index/index.vue
View File

@ -208,8 +208,7 @@
</view>
</view>
<view class="flex align-center justify-between" style="margin-top: 20px;">
<view :class="activeTab == item.id ? 'tapDsalk' : 'dsalk'" @click="getJqqd(item.id)"
v-for="(item,homeIindex) in homePageCountNum" :key="homeIindex">
<view :class="activeTab == item.id ? 'tapDsalk' : 'dsalk'" @click="getJqqd(item.id)" v-for="(item,homeIindex) in homePageCountNum" :key="homeIindex">
<view class="sda flex align-center" v-if="homeIindex==indexImg" v-for="(imgItem,indexImg) in jiazhongIimg" :key="indexImg">
<image :src="imgItem.url" mode="" style="width: 30px;height: 30px;"></image>
<!-- <image :src="item.icon" style="width: 20px;height: 20px;"></image> -->
@ -425,6 +424,12 @@
<text
style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">今日服务</text>
</view>
<view class="bgwhite radius margin-top-sm padding-bottom-sm"
:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="xian" v-if="item.status == 6"></view>
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
<view class="pintuan-title" >
<image src="../../static/clock.png" class="pintuan-img"></image>
@ -437,9 +442,7 @@
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down>
</view>
<view class="bgwhite radius margin-top-sm padding-bottom-sm"
:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="flex justify-between padding-sm ">
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
<view class="progress-status" v-if="item.status == 1">待付款...</view>
@ -455,8 +458,6 @@
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
</view>
<view class="xian" v-if="item.status == 6"></view>
<view class=" u-flex u-p-t-30 padding-sm">
<view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
@ -698,7 +699,6 @@ export default {
},
onShow() {
console.log(this.isLogin);
this.getHomeListData();
this.getHomeMaterialPackageList();
//是否开启理疗师端实时定位 330
@ -730,6 +730,7 @@ export default {
// this.userId = uni.getStorageSync('userId')
this.userId = this.$queue.getData("userId")
console.log('this.userId------------->',this.userId);
this.isCashDeposit = uni.getStorageSync('isCashDeposit')
if (this.userId) {
console.log(this.userId, "dwdwadwdawd============>");
@ -831,6 +832,11 @@ export default {
this.formatHomeMaterialPackageList = res?.data.slice(0, 3);
// this.formatHomeMaterialPackageList = [];
this.homeMaterialPackageList = res.data;
console.log('this.homeMaterialPackageList------>>',this.homeMaterialPackageList);
console.log('this.formatHomeMaterialPackageList------>>',this.formatHomeMaterialPackageList);
}
})
}
@ -859,6 +865,8 @@ export default {
//获取App首页数据
getHomeListData() {
let artificerId = uni.getStorageSync("artificerId");
console.log('artificerId------->',artificerId);
if (artificerId) {
this.$Request.getXZX("/app/artificer/integral/home/?artificerId=" + artificerId,).then((res) => {
if (res && res.data) {