Ver Fonte

no message

py há 2 anos atrás
pai
commit
2b5531fdb9
61 ficheiros alterados com 28 adições e 7 exclusões
  1. 9 3
      pages-school/school-circle.vue
  2. 1 1
      pages.json
  3. 18 3
      pages/index/index.vue
  4. BIN
      static/img/blank/no-goods.png
  5. BIN
      static/img/buy/group-bg.png
  6. BIN
      static/img/buy/qiang.png
  7. BIN
      static/img/buy/t-all.png
  8. BIN
      static/img/buy/tg-det-bg.png
  9. BIN
      static/img/buy/ticket-bg.png
  10. BIN
      static/img/common/n-select.png
  11. BIN
      static/img/common/wx-zf.png
  12. BIN
      static/img/common/y-select.png
  13. BIN
      static/img/index/index-bg.png
  14. BIN
      static/img/index/index-dq.png
  15. BIN
      static/img/index/index-gx.png
  16. BIN
      static/img/index/index-hs.png
  17. BIN
      static/img/index/index-pw.png
  18. BIN
      static/img/index/index-q.png
  19. BIN
      static/img/index/index-sxgw.png
  20. BIN
      static/img/index/index-tg.png
  21. BIN
      static/img/index/index-xyq.png
  22. BIN
      static/img/index/index-zp.png
  23. BIN
      static/img/index/lq-bg.png
  24. BIN
      static/img/index/sxgw.png
  25. BIN
      static/img/index/tc-content.png
  26. BIN
      static/img/index/tc-top.png
  27. BIN
      static/img/logo/logo.png
  28. BIN
      static/img/my/bmy-no.png
  29. BIN
      static/img/my/bmy-ok.png
  30. BIN
      static/img/my/dz.png
  31. BIN
      static/img/my/my-no.png
  32. BIN
      static/img/my/my-ok.png
  33. BIN
      static/img/my/user-img.png
  34. BIN
      static/img/my/zp.png
  35. BIN
      static/img/order/lxkf.png
  36. BIN
      static/img/school/add.png
  37. BIN
      static/img/school/bg.png
  38. BIN
      static/img/school/icon.png
  39. BIN
      static/img/school/ts.png
  40. BIN
      static/img/tabBar/business-highlight.png
  41. BIN
      static/img/tabBar/business.png
  42. BIN
      static/img/tabBar/home-highlight.png
  43. BIN
      static/img/tabBar/home.png
  44. BIN
      static/img/tabBar/my-highlight.png
  45. BIN
      static/img/tabBar/my.png
  46. BIN
      static/img/takeout/add.png
  47. BIN
      static/img/takeout/all.png
  48. BIN
      static/img/takeout/bg-back.png
  49. BIN
      static/img/takeout/bg.png
  50. BIN
      static/img/takeout/dq-bg.png
  51. BIN
      static/img/takeout/info-address.png
  52. BIN
      static/img/takeout/info-class.png
  53. BIN
      static/img/takeout/info-gg.png
  54. BIN
      static/img/takeout/info-phone.png
  55. BIN
      static/img/takeout/info-time.png
  56. BIN
      static/img/takeout/info-zz.png
  57. BIN
      static/img/takeout/j.png
  58. BIN
      static/img/takeout/qu-icon.png
  59. BIN
      static/img/takeout/quan-bg.png
  60. BIN
      static/img/toLeft.png
  61. BIN
      static/img/toRight.png

+ 9 - 3
pages-school/school-circle.vue

@@ -20,7 +20,7 @@
 
 		<view class="nav-box display-flex box-border-box mb-20">
 			<view class="nav-item view-nowrap" @click="selectTopicId(item.id)"
-				:class="fromData.topic_id == item.id?'h130':''" v-for="(item,i) in classList" :key="i">
+				:class="fromData.topic_id == item.id?'h130':'bgc-f'" v-for="(item,i) in classList" :key="i">
 				<image v-if="item.id == 0" class="nav-icon" src="@/static/img/school/icon.png" mode=""></image>
 				<image v-else class="nav-icon" :src="item.image" mode=""></image>
 				<view class="fs-24 plr-24 " :class="fromData.topic_id==item.id?'fw-600 fc-41ABF5':''">{{item.name}}
@@ -752,7 +752,7 @@
 		.ts-box {
 			width: 100%;
 			height: 72rpx;
-			background: linear-gradient(180deg, #FFDBD0 0%, #FFFFFF 100%);
+			background: linear-gradient(180deg, #FFDBD0 -50%, #FFFFFF 100%);
 			border-radius: 16rpx;
 
 			image {
@@ -797,6 +797,8 @@
 
 		.type-box {
 			.box-s {
+				height: 50rpx;
+				line-height: 50rpx;
 				font-weight: 600 !important;
 				color: #41ABF5;
 				background: #E0F1FF !important;
@@ -805,12 +807,15 @@
 			}
 
 			.box-1 {
-				padding: 8rpx 32rpx;
+				padding: 0 32rpx;
+				height: 50rpx;
+				line-height: 50rpx;
 				margin-right: 20rpx;
 				background-color: #fff;
 				border-radius: 12rpx;
 				font-size: 24rpx;
 				font-weight: 400;
+				box-sizing: border-box;
 			}
 
 			.box-2 {
@@ -820,6 +825,7 @@
 				text-align: center;
 				border-radius: 12rpx 12rpx 12rpx 12rpx;
 				border: 1rpx solid #41ABF5;
+				box-sizing: border-box;
 			}
 		}
 

+ 1 - 1
pages.json

@@ -420,7 +420,7 @@
 		},
 			{
 				"name": "店铺详情",
-				"path": "pages-takeout/shop",
+				"path": "pages-school/school-circle",
 				"query": "shop_id=1"
 			}
 		]

+ 18 - 3
pages/index/index.vue

@@ -8,7 +8,8 @@
 					<view slot="custom" class="align-items-center" @click="toSelectSchool()">
 						<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
 						<image class="wh-40" src="@/static/img/index/dw.png" mode=""></image>
-						<view class="fs-32 maxw-220 fw-600 ml-10 text-overflow-ellipsis-one">{{schoolData.school_name||''}}
+						<view class="fs-32 maxw-220 fw-600 ml-10 text-overflow-ellipsis-one">
+							{{schoolData.school_name||''}}
 						</view>
 						<image class="nav-icon ml-10" src="@/static/img/index/index-right.png" mode="aspectFit"></image>
 					</view>
@@ -160,7 +161,7 @@
 							<view class="fs-24 mb-18 fc-6">
 								{{item.desc}}
 							</view>
-							<view class="but-box fs-28 fc-f" @click="receive(item)">立即领取</view>
+							<view class="but-box fs-28 fc-f" @click="receive(item,index)">立即领取</view>
 							<view class="ball"></view>
 							<view class="ball-two"></view>
 						</view>
@@ -189,7 +190,8 @@
 		getGoodsList
 	} from '@/api/goods.js';
 	import {
-		couponHome
+		couponHome,
+		receiveCoupon
 	} from '@/api/coupon.js'
 	export default {
 		data() {
@@ -351,6 +353,19 @@
 			this.couponHome()
 		},
 		methods: {
+			receive(item,index) {
+				receiveCoupon({grant_id: item.grant_id,coupon_id: item.coupon_id}).then((res) => {
+					if(res.code == 1) {
+						tools.success(res.msg)
+						this.couponData.splice(index, 1)
+						if(this.couponData.length<=0) {
+							this.gbPOp()
+						}
+					}else {
+						tools.error(res.msg)
+					}
+				})
+			},
 			couponHome() {
 				let operate_id = uni.getStorageSync('operate_id');
 				couponHome({

BIN
static/img/blank/no-goods.png


BIN
static/img/buy/group-bg.png


BIN
static/img/buy/qiang.png


BIN
static/img/buy/t-all.png


BIN
static/img/buy/tg-det-bg.png


BIN
static/img/buy/ticket-bg.png


BIN
static/img/common/n-select.png


BIN
static/img/common/wx-zf.png


BIN
static/img/common/y-select.png


BIN
static/img/index/index-bg.png


BIN
static/img/index/index-dq.png


BIN
static/img/index/index-gx.png


BIN
static/img/index/index-hs.png


BIN
static/img/index/index-pw.png


BIN
static/img/index/index-q.png


BIN
static/img/index/index-sxgw.png


BIN
static/img/index/index-tg.png


BIN
static/img/index/index-xyq.png


BIN
static/img/index/index-zp.png


BIN
static/img/index/lq-bg.png


BIN
static/img/index/sxgw.png


BIN
static/img/index/tc-content.png


BIN
static/img/index/tc-top.png


BIN
static/img/logo/logo.png


BIN
static/img/my/bmy-no.png


BIN
static/img/my/bmy-ok.png


BIN
static/img/my/dz.png


BIN
static/img/my/my-no.png


BIN
static/img/my/my-ok.png


BIN
static/img/my/user-img.png


BIN
static/img/my/zp.png


BIN
static/img/order/lxkf.png


BIN
static/img/school/add.png


BIN
static/img/school/bg.png


BIN
static/img/school/icon.png


BIN
static/img/school/ts.png


BIN
static/img/tabBar/business-highlight.png


BIN
static/img/tabBar/business.png


BIN
static/img/tabBar/home-highlight.png


BIN
static/img/tabBar/home.png


BIN
static/img/tabBar/my-highlight.png


BIN
static/img/tabBar/my.png


BIN
static/img/takeout/add.png


BIN
static/img/takeout/all.png


BIN
static/img/takeout/bg-back.png


BIN
static/img/takeout/bg.png


BIN
static/img/takeout/dq-bg.png


BIN
static/img/takeout/info-address.png


BIN
static/img/takeout/info-class.png


BIN
static/img/takeout/info-gg.png


BIN
static/img/takeout/info-phone.png


BIN
static/img/takeout/info-time.png


BIN
static/img/takeout/info-zz.png


BIN
static/img/takeout/j.png


BIN
static/img/takeout/qu-icon.png


BIN
static/img/takeout/quan-bg.png


BIN
static/img/toLeft.png


BIN
static/img/toRight.png