8-12

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "君海蓝",
-    "appid" : "__UNI__27A0365",
+    "name" : "君子堂",
+    "appid" : "__UNI__80E213F",
     "description" : "六牛云商 - 为传统商户量身打造的全渠道线上线下一体化新零售营销系统! 以客户为中心，将线上和线下、进销存、CRM、财务一体化，完美融合！支持连锁、代理、经销多种运营模式，小程序一键发布，自定义APP界面，多套模板选择。7X24小时为您服务",
     "versionName" : "1.1.3",
     "versionCode" : 113,

pages.json

@@ -197,7 +197,7 @@
 			{
 				"path": "user/dyquan",
 				"style": {
-					"navigationBarTitleText": "我的抵用券"
+					"navigationBarTitleText": "我的优惠卡"
 				}
 			},
 			{

pages/user/user.vue

@@ -172,28 +172,30 @@
 					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-vip-' + theme + '.png'"></image></view>
 					<view class="fn-label">会员卡</view>
 				</view> -->
-				<!-- <view class="fn-li" @click="navTo('/pagesT/user/dyquan')">
+				<view class="fn-li" @click="navTo('/pagesT/user/dyquan')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/dyq.png"></image>
 					</view>
-					<view class="fn-label">我的抵用券</view>
-				</view> -->
+					<view class="fn-label">我的优惠卡</view>
+				</view>
 				<view class="fn-li" @click="navTo('/pagesT/address/address')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/wddz.png"></image>
 					</view>
 					<view class="fn-label">我的地址</view>
 				</view>
-				<view class="fn-li" @click="navTo('/pagesT/user/myyhk')">
+				<!-- <view class="fn-li" @click="navTo('/pagesT/user/myyhk')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/yhk.png"></image>
 					</view>
 					<view class="fn-label">我的优惠卡</view>
-				</view>
-					<view class="fn-li" @click="goDistribution">
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-fen-' + theme + '.png'"></image></view>
+				</view> -->
+				<!-- <view class="fn-li" @click="goDistribution">
+					<view class="fn-icon">
+						<image :src="'https://onlineimg.qianniao.vip/ic-fen-' + theme + '.png'"></image>
+					</view>
 					<view class="fn-label">分销中心</view>
-				</view>
+				</view> -->
 				<view class="fn-li" @click="navTo('/pagesT/user/Collection')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/wdsc.png"></image>
@@ -380,7 +382,7 @@
 					this.getOrderStatusNum();
 				} else {
 					this.vip_data = {};
-					
+
 				}
 			}
 		},
@@ -529,7 +531,7 @@
 					});
 					//#endif
 				} else {
-						this.getInfoBusinessman();
+					this.getInfoBusinessman();
 					// console.log(this.distributionSet.level,'this.distributionSet.level');
 					// if (this.distributionSet.level && this.distributionSet.level > 0) {
 					// 	this.getInfoBusinessman();
@@ -636,7 +638,7 @@
 					}
 					if (this.userInfo.name == '微信用户') {
 						let show = uni.getStorageSync('showchangename')
-						if(show != 1) {
+						if (show != 1) {
 							this.show_change_name = true
 						}
 					}
@@ -664,19 +666,19 @@
 				this.tip_model = false;
 			},
 			nameCancel() {
-				uni.setStorageSync('showchangename',1)
+				uni.setStorageSync('showchangename', 1)
 				this.show_change_name = false;
-				
+
 			},
 			// 跳转完善资料页面
 			finishCofirm() {
 				this.goPage('/pagesT/user/editUserInfo');
 			},
 			nameCofirm() {
-				uni.setStorageSync('showchangename',1)
+				uni.setStorageSync('showchangename', 1)
 				this.goPage('/pagesT/selfconfig/selfconfig');
 			},
-			
+
 		},
 		onShareAppMessage(options) {
 			return {
@@ -1157,4 +1159,4 @@
 			text-align: center;
 		}
 	}
-</style>
+</style>

pagesT/money/paySuccess.vue

@@ -29,7 +29,7 @@ export default {
 	},
 	onLoad(options) {
 		this.price=options.price
-		this.isyhk = options.isyhk
+		this.isyhk = options.isyhq
 		this.isyy = options.isyy
 		console.log(this.price)
 		// this.price = 10;

pagesT/order/createOrderT.vue

@@ -92,7 +92,7 @@
 		<scroll-view scroll-x="true" class="zp-wrap" v-if="timed">
 			<view class="zp-item" v-for="ygitem in yg.list" @click="choosYg(ygitem)"
 				:class="{'choose': ygitem.uid == choose_yg.uid}">
-				<image :src="ygitem.avatar" mode="" class="zp-logo"></image>
+				<image :src="ygitem.avatar || '../../static/img/avt.png'" mode="" class="zp-logo"></image>
 				<view class="zp-name">{{ygitem.staffName}}</view>
 			</view>
 		</scroll-view>
@@ -382,8 +382,11 @@
 				}).then(({
 					data
 				}) => {
-					console.log()
+					console.log(data,'data')
 					let choose_time = that.choose_time_detail.replace(/\:/g, '')
+					if(data.time_slot) {
+						data.time_slot = JSON.parse(data.time_slot)
+					}
 					let worktime = [data.time_slot[0][0].replace(/\:/g, ''), data.time_slot[0][1].replace(/\:/g,
 						'')]
 					// 判断员工是否在工作时间
@@ -394,7 +397,7 @@
 						console.log('该员工不在工作时间')
 						that.cannot()
 					}
-					if (data.reserved.length > 0) {
+					if (data.reserved && data.reserved.length > 0) {
 						for (let i = 0; i < data.reserved.length; i++) {
 							console.log(i)
 							if (that.choose_time_detail == data.reserved[i]) {

pagesT/order/orderT.vue

@@ -28,11 +28,14 @@
 									}}
 								</text>
 							</view>
-							<view class="goods-ul">
+							<view class="goods-ul" style="display: flex;">
 								<block v-for="(it, gindex) in item.project" :key="gindex">
-									<view class="goods-li clearfix" v-if="gindex <= 4">
+									<view class="goods-li clearfix" v-if="gindex <= 4" style="flex-shrink: 0;">
 										<image class="goods-img float_left" :src="it.image" mode="aspectFill"></image>
 									</view>
+									<view class="" style="padding-left: 10rpx;">
+										{{item.project[0].name}}
+									</view>
 								</block>
 							</view>
 							<view class="money-view">