py 1 год назад
Родитель
Сommit
2ebfd5ff9f
6 измененных файлов с 41 добавлено и 12 удалено
  1. 1 1
      manifest.json
  2. 4 1
      pages-buy/group-goods-info.vue
  3. 3 3
      pages-buy/group-pay.vue
  4. 12 1
      pages-buy/group-shop.vue
  5. 1 1
      pages-buy/group.vue
  6. 20 5
      pages-order/group-info.vue

+ 1 - 1
manifest.json

@@ -100,7 +100,7 @@
             "proxy" : {
             "proxy" : {
                 "/api" : {
                 "/api" : {
                     "target" : "https://test-userapi.sjzkeji.com",
                     "target" : "https://test-userapi.sjzkeji.com",
-					// "target" : "https://userapi.sjzkeji.com",
+                    // "target" : "https://userapi.sjzkeji.com",
                     "changeOrigin" : true,
                     "changeOrigin" : true,
                     "secure" : false,
                     "secure" : false,
                     "pathRewrite" : {
                     "pathRewrite" : {

+ 4 - 1
pages-buy/group-goods-info.vue

@@ -112,7 +112,7 @@
 										<view class="fc-9 mr-18">
 										<view class="fc-9 mr-18">
 											({{goods_item.number}}{{goods_item.unit}})
 											({{goods_item.number}}{{goods_item.unit}})
 										</view>
 										</view>
-										<view class="">
+										<view class="w-100 text-align-right">
 											¥{{goods_item.price}}
 											¥{{goods_item.price}}
 										</view>
 										</view>
 									</view>
 									</view>
@@ -361,6 +361,9 @@
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+	.w-100 {
+		min-width: 100rpx;
+	}
 	.w-h-100 {
 	.w-h-100 {
 		width: 100%;
 		width: 100%;
 		height: 100%;
 		height: 100%;

+ 3 - 3
pages-buy/group-pay.vue

@@ -19,7 +19,7 @@
 								{{goods_info.pre_book == 1?'无需预约':'需预约'}}
 								{{goods_info.pre_book == 1?'无需预约':'需预约'}}
 							</view>
 							</view>
 							<view class="fs-22 fc-9">
 							<view class="fs-22 fc-9">
-								随时退 . 过期自动退 . 到店
+								随时退 . 过期自动退
 							</view>
 							</view>
 						</view>
 						</view>
 					</view>
 					</view>
@@ -165,7 +165,7 @@
 			blur() {
 			blur() {
 				if (this.goods_info.is_quota == 1) {
 				if (this.goods_info.is_quota == 1) {
 					if (this.fromData.number >= this.goods_info.quota_num) {
 					if (this.fromData.number >= this.goods_info.quota_num) {
-						tools.error('购买数量已达限购数量')
+						tools.error('限购'+ this.goods_info.quota_num + '张')
 						this.fromData.number = this.goods_info.quota_num
 						this.fromData.number = this.goods_info.quota_num
 					}
 					}
 				}
 				}
@@ -189,7 +189,7 @@
 					// 加
 					// 加
 					if (this.goods_info.is_quota == 1) {
 					if (this.goods_info.is_quota == 1) {
 						if (this.fromData.number >= this.goods_info.quota_num) {
 						if (this.fromData.number >= this.goods_info.quota_num) {
-							tools.error('购买数量已达限购数量')
+							tools.error('限购'+ this.goods_info.quota_num + '张')
 							return
 							return
 						} else if (this.fromData.number >= 99) {
 						} else if (this.fromData.number >= 99) {
 							tools.error('购买数量已达最大值')
 							tools.error('购买数量已达最大值')

+ 12 - 1
pages-buy/group-shop.vue

@@ -23,7 +23,7 @@
 					<view class="">
 					<view class="">
 						营业时间:{{timeData}}
 						营业时间:{{timeData}}
 					</view>
 					</view>
-					<image src="@/static/img/takeout/info-phone.png" mode="" class="phone"></image>
+					<image src="@/static/img/takeout/info-phone.png" mode="" class="phone" @click="phoneBut(shopInfo.shop_phone)"></image>
 				</view>
 				</view>
 				<view class="uni-margin-wrap mb-18">
 				<view class="uni-margin-wrap mb-18">
 					<swiper class="swiper" :circular='true' :autoplay="true" :interval="3000" :duration="500">
 					<swiper class="swiper" :circular='true' :autoplay="true" :interval="3000" :duration="500">
@@ -145,6 +145,17 @@
 		},
 		},
 		mounted() {},
 		mounted() {},
 		methods: {
 		methods: {
+			phoneBut(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone, // 电话号码
+					success: function() {
+						console.log('拨打电话成功');
+					},
+					fail: function() {
+						console.log('拨打电话失败');
+					}
+				});
+			},
 			goTOPay(item) {
 			goTOPay(item) {
 				uni.navigateTo({
 				uni.navigateTo({
 					url: '/pages-buy/group-pay?shop_id=' + item.shop_id + '&goods_id=' + item.id
 					url: '/pages-buy/group-pay?shop_id=' + item.shop_id + '&goods_id=' + item.id

+ 1 - 1
pages-buy/group.vue

@@ -8,7 +8,7 @@
 					<view class="head-search align-items-center">
 					<view class="head-search align-items-center">
 						<!-- <uni-icons class="s-icon" type="search" size="19"></uni-icons> -->
 						<!-- <uni-icons class="s-icon" type="search" size="19"></uni-icons> -->
 						<image class="wh-32" src="@/static/img/index/ss.png" mode=""></image>
 						<image class="wh-32" src="@/static/img/index/ss.png" mode=""></image>
-						<input class="input" v-model="fromData.search" type="text" placeholder="搜一搜带你玩周边">
+						<input class="input" v-model="fromData.search" type="text" placeholder="搜一搜">
 						<view class="head-search-buttom text-align-center fs-28 fw-500 fc-f" @click="searchFun()">搜索
 						<view class="head-search-buttom text-align-center fs-28 fw-500 fc-f" @click="searchFun()">搜索
 						</view>
 						</view>
 					</view>
 					</view>

+ 20 - 5
pages-order/group-info.vue

@@ -60,10 +60,10 @@
 		</view>
 		</view>
 		<scroll-view :scroll-y="true" class="scroll-view-css p-24 box-border-box" @scrolltolower="scrolltolower">
 		<scroll-view :scroll-y="true" class="scroll-view-css p-24 box-border-box" @scrolltolower="scrolltolower">
 			<view class="bgc-f b-rad-20 p-24 box-border-box mb-20">
 			<view class="bgc-f b-rad-20 p-24 box-border-box mb-20">
-				<view class="goods-box">
-					<view class="align-items-center flex-justify-space mb-20">
+				<view class="goods-box" @click="goGoodsInfo">
+					<view class="align-items-center mb-20">
 						<image class="goods-img mr-16 flex-shrink0" :src="infoData.goods_img" mode=""></image>
 						<image class="goods-img mr-16 flex-shrink0" :src="infoData.goods_img" mode=""></image>
-						<view class="">
+						<view class="flex-1">
 							<view class="align-items-center flex-justify-space mb-2">
 							<view class="align-items-center flex-justify-space mb-2">
 								<view class="fs-28 fc-3 w-300 text-overflow-ellipsis-one mr-36">
 								<view class="fs-28 fc-3 w-300 text-overflow-ellipsis-one mr-36">
 									{{infoData.goods_name}}
 									{{infoData.goods_name}}
@@ -72,9 +72,18 @@
 									¥{{(Number(infoData.goods_price)*Number(infoData.goods_number)).toFixed(2)}}
 									¥{{(Number(infoData.goods_price)*Number(infoData.goods_number)).toFixed(2)}}
 								</view>
 								</view>
 							</view>
 							</view>
-							<view class="fs-24 fc-9">
-								x{{infoData.goods_number}}
+							<view class="align-items-center flex-justify-space">
+								<view class="fs-24 fc-9">
+									购买数量:{{infoData.goods_number}}
+								</view>
+								<view class="fs-24 fc-9">
+									使用数量:{{infoData.finish_number}}
+								</view>
+								<view class="fs-24 fc-9">
+									退款数量:{{infoData.refund_number}}
+								</view>
 							</view>
 							</view>
+
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -214,6 +223,12 @@
 			})
 			})
 		},
 		},
 		methods: {
 		methods: {
+			goGoodsInfo() {
+				uni.navigateTo({
+					url: '/pages-buy/group-goods-info?shop_id=' + this.infoData.shop_id + '&goods_id=' + this.infoData.goods_id +
+						'&shop_name=' + this.infoData.shop.shop_name
+				});
+			},
 			goRefund() {
 			goRefund() {
 				uni.navigateTo({
 				uni.navigateTo({
 					url: '/pages-buy/group-refund?order_id=' + this.infoData.id
 					url: '/pages-buy/group-refund?order_id=' + this.infoData.id