DESKTOP-70VPDLK\Administrator 2 年 前
親
コミット
1abb753393

+ 43 - 9
pages-takeout/aptitude.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="aptitude-index iPhone-bottom flex-common-css box-border-box bgc-f">
 		<Nav title='营业资质'></Nav>
-		
+
 		<view class="scroll-view-css info-list box-border-box p-24 mb-20">
 			<view class="card-box box-border-box p-24">
 				<view class="mb-20 fw-600 fs-32">营业资质</view>
-				<image v-for="(item,i) in 2" :key="i" @click="lookImg(i,item)"
-				src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+				<image @click="lookImg(shopsInfo.license_img)"
+				:src="shopsInfo.license_img" mode="scaleToFill"></image>
 			</view>
 			<view class="card-box box-border-box p-24">
 				<view class="mb-20 fw-600 fs-32">许可证</view>
-				<image v-for="(item,i) in 2" :key="i" @click="lookImg(i,item)"
-				src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+				<image  @click="lookImg(shopsInfo.food_license_img)"
+                :src="shopsInfo.food_license_img" mode="scaleToFill"></image>
 			</view>
 		</view>
 	</view>
@@ -19,15 +19,49 @@
 
 <script>
 	import tools from "@/service/tools";
+  import {shopInfo} from "@/api/shop";
 	export default {
 		data(){
 			return{
-				
+        shopId:'',
+        shopsInfo:{
+          license_img:'',
+          food_license_img:'',
+        }
 			}
 		},
+    onLoad(data) {
+      console.log(data)
+      if(data.shopId){
+        this.shopId=data.shopId
+        this.getShopInfo()
+      }else {
+        tools.leftClick()
+      }
+    },
+    mounted() {
+    },
 		methods:{
-			lookImg(i,item){
-				tools.lookBigImg(i,item)
+      getShopInfo() {
+        const operate_id = uni.getStorageSync('operate_id')
+        shopInfo({
+          operate_id: operate_id,
+          shop_id: this.shopId
+        }).then((res) => {
+          if (res.code == 1) {
+            this.shopsInfo = res.data
+          } else {
+            tools.error(res.msg)
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1
+              })
+            }, 1500)
+          }
+        })
+      },
+			lookImg(i){
+				tools.lookBigImg(i,[this.shopsInfo.license_img,this.shopsInfo.food_license_img])
 			},
 		},
 	}
@@ -51,4 +85,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 5 - 5
pages-takeout/shop-mod/info.vue

@@ -18,10 +18,10 @@
 				<image src="@/static/img/takeout/info-phone.png" mode=""></image>
 				<view class="fs-28 fw-400">联系电话:{{shopInfoData.shop_phone}} </view>
 			</view>
-			<view class="right-img-f align-items-center">
+			<view class="right-img-f align-items-center" @click.stop="to()">
 				<image src="@/static/img/takeout/info-zz.png" mode=""></image>
 				<view class="fs-28 fw-400">查看营业资质 </view>
-				<image @click="to()" class="right-img" src="@/static/img/toRight.png" mode=""></image>
+				<image  class="right-img" src="@/static/img/toRight.png" mode=""></image>
 			</view>
 		</view>
 
@@ -59,7 +59,7 @@
 		methods: {
 			to() {
 				uni.navigateTo({
-					url: '/pages-takeout/aptitude'
+					url: '/pages-takeout/aptitude?shopId='+this.shopId
 				})
 			},
 			shopInfo() {
@@ -71,7 +71,7 @@
 					if (res.code == 1) {
 						this.shopInfoData = res.data
 						res.data.business_hours.forEach((v, k) => {
-							// let time = 
+							// let time =
 							v.forEach((i, j) => {
 								let time = ''
 								if (j == 0 || j == 3) {
@@ -126,4 +126,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 3 - 0
pages-takeout/shop-mod/menu.vue

@@ -250,6 +250,9 @@
 						this.popData.price = this.popData.spec_list[spec_key].seckill_money > 0 ? this.popData.spec_list[
 							spec_key].seckill_money : this.popData.spec_list[spec_key].price
 						this.popData.line_price = this.popData.spec_list[spec_key].line_price
+            if(this.popData.goods_spec_id!==this.popData.spec_list[spec_key].goods_spec_id + ''){
+              this.popData.num =1
+            }
 						this.popData.goods_spec_id = this.popData.spec_list[spec_key].goods_spec_id + ''
 						let cartKey = this.cartData.goods_list.findIndex(row => this.popData.goods_spec_id * 1 === row
 							.goods_spec_id * 1)