Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

api/common.js

@@ -26,4 +26,5 @@ export const setRiderApply = (data) => request('/api/system/' + 'riderApply', 'p
 // 文字说明
 export const getCommonText = (data) => request(commonUrl + 'text', 'post', { ...data })
 // 获取实习岗位二维码
-export const commonPracticeCode = (data) => request(commonUrl + 'practice_code', 'post', { ...data })
+export const commonPracticeCode = (data) => request(commonUrl + 'practice_code', 'post', { ...data })
+export const getDeliveryMoney = (data) => request(commonUrl + 'delivery_money', 'post', { ...data },false)

api/order.js

@@ -10,4 +10,4 @@ export const orderCancel = (data) => request(newsUrl + 'cancel', 'post', { ...da
 // 获取订单状态
 export const orderStatus = (data) => request(newsUrl + 'status', 'post', { ...data },false)
 // 支付订单
-export const orderPay = (data) => request(newsUrl + 'pay', 'post', { ...data },false)
+export const orderPay = (data) => request(newsUrl + 'pay', 'post', { ...data },false)

pages-takeout/shop-mod/menu.vue

@@ -55,21 +55,21 @@
 					</view>
 				</view>
 				<view class="goods-info flex-justify-space mb-32 box-border-box plr-32">
-					<image src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+					<image v-if="popData.goodsItem.goods_image" :src="popData.goodsItem.goods_image" mode="scaleToFill"></image>
 					<view class="flex-1">
-						<view style="width: 446rpx;" class="fw-600 fs-34 text-overflow-ellipsis-one">[畅销款]奥尔1良烤肉牛油拌饭
+						<view style="width: 446rpx;" class="fw-600 fs-34 text-overflow-ellipsis-one">{{popData.goodsItem.goods_name}}
 						</view>
-						<view class="fw-400 fc-9 fs-24">月销196</view>
+						<view class="fw-400 fc-9 fs-24">月销{{popData.goodsItem.sales}}</view>
 					</view>
 				</view>
 
 				<view class="scroll-view-css box-border-box plr-32">
-					<view class="" v-for="(item,i) in popData.specList" :key="i">
-						<view class="fs-32 fw-500 fc-0 mb-32">{{item.specName}}</view>
+					<view class="" v-for="(item,i) in popData.spec_attr" :key="i">
+						<view class="fs-32 fw-500 fc-0 mb-32">{{item.group_name}}</view>
 						<view class="flex-wrap-wrap">
-							<view class="spec-item text-align-center fs-28" :class="info.isSelect?'s-item':'n-item'"
-								v-for="(info,k) in item.list" :key="k" @click="select(i,k,item,info)">
-								{{info.name}}
+							<view class="spec-item text-align-center fs-28" :class="popData.spec_ids.indexOf(info.item_id)>=0?'s-item':'n-item'"
+								v-for="(info,k) in item.spec_items" :key="k" @click="selectSpec(info,i)">
+								{{info.spec_value}}
 							</view>
 						</view>
 
@@ -81,20 +81,20 @@
 						<view class="pop-buttom-left">
 							<view class="">
 								<span class="fw-600 fs-32 fc-ED301D">￥</span>
-								<span class="fw-600 fs-48 fc-ED301D">19.26</span>
+								<span class="fw-600 fs-48 fc-ED301D">{{popData.price}}</span>
 							</view>
 							<view class="">
 								<span class="fw-400 fs-24 fc-9">已选规格：</span>
-								<span class="fw-400 fs-24">不辣</span>
+								<span class="fw-400 fs-24">{{popData.spec_name.join(';')}}</span>
 							</view>
 						</view>
 						<view class="display-flex align-items-center">
-							<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f">-</view>
-							<view class="right-only-right-2 text-align-center fs-28 fw-400">1</view>
-							<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f">+</view>
+							<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click.stop="setSpecNum(1)">-</view>
+							<view class="right-only-right-2 text-align-center fs-28 fw-400">{{popData.num}}</view>
+							<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click.stop="setSpecNum(2)">+</view>
 						</view>
 					</view>
-					<view class="pop-buttom-2  text-align-center fs-32 fw-600 fc-f">选好了</view>
+					<view class="pop-buttom-2  text-align-center fs-32 fw-600 fc-f" @click="addred(4)">选好了</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -103,8 +103,8 @@
 
 <script>
 	import tools from "@/service/tools";
-  import {shopCategory, shopGoods} from "@/api/shop";
-  import {getShopIngList} from "@/api/shopping";
+  import {shopCategory, shopGoods, shopGoodsSpec} from "@/api/shop";
+  import {getShopIngList, setShopIngAdd, setShopIngDel, setShopIngNumber} from "@/api/shopping";
 	export default {
 		name: 'menu-box',
     props:{
@@ -129,78 +129,24 @@
           must_category:0,
           is_place_order:0,
           err_msg:0,
-          goods_list:0,
+          goods_list:[],
         },
+        isAjax:false,
         operate_id: '',
 
 				popData: {
-					spec_name: '',
-					spec_ids: '',
-					spec_list: [],
-					specList: [{
-							specName: '口味',
-							specType: 1,
-							list: [{
-								name: '辣1',
-								id: 1,
-								isSelect: false
-							}, {
-								name: '辣2',
-								id: 2,
-								isSelect: false
-							}, {
-								name: '辣3',
-								id: 3,
-								isSelect: false
-							}, {
-								name: '辣4',
-								id: 4,
-								isSelect: false
-							}, ]
-						},
-						{
-							specName: '大小',
-							specType: 2,
-							list: [{
-								name: '大1',
-								id: 5,
-								isSelect: false
-							}, {
-								name: '大2',
-								id: 6,
-								isSelect: false
-							}, {
-								name: '大3',
-								id: 7,
-								isSelect: false
-							}, {
-								name: '大4',
-								id: 8,
-								isSelect: false
-							}, ]
-						},
-						{
-							specName: '加料',
-							specType: 3,
-							list: [{
-								name: '加1',
-								id: 9,
-								isSelect: false
-							}, {
-								name: '加2',
-								id: 10,
-								isSelect: false
-							}, {
-								name: '加3',
-								id: 11,
-								isSelect: false
-							}, {
-								name: '加4',
-								id: 12,
-								isSelect: false
-							}, ]
-						},
-					]
+					goodsItem: {},
+          price: '0.00',
+          line_price: '',
+          num: 0,
+					goods_id: '',
+          spec_key: '',
+          goods_spec_id: '',
+					spec_name: [],
+					spec_ids: [],
+          spec_list: [],
+          spec_attr: [],
+
 				},
 			}
 		},
@@ -212,34 +158,119 @@
 		mounted() {
       this.operate_id = uni.getStorageSync('operate_id')
 			this.getShopGoods();
+			this.getShopIngList(true);
 
 		},
 		methods: {
-      getShopIngList(){
-        getShopIngList().then(res=>{
+      setSpecNum(type){
+        console.log(this.popData.goods_spec_id)
+        if(this.isAjax){
+          return
+        }
+        this.isAjax=true
+        if (type === 1) {
+          // 减
+          if(this.popData.num>0){
+            --this.popData.num;
+          }else {
+            this.isAjax=false
+            return
+          }
+        } else {
+          // 加
+          ++this.popData.num;
+        }
+        let cartKey=this.cartData.goods_list.findIndex(row=>this.popData.goods_spec_id===row.goods_spec_id)
+        console.log(cartKey)
+        console.log(type===2 && cartKey<0)
+        if(type===2 && cartKey<0){
+          this.popData.num++
+          this.setShopIngAdd(this.popData.goods_id,this.popData.goodsItem.category_id,this.popData.goods_spec_id)
+        }else {
+          this.setShopIngNumber(this.popData.goods_id,this.popData.goodsItem.category_id,type,this.popData.goods_spec_id)
+        }
+      },
+      getShopGoodsSpec(item){
+        shopGoodsSpec({
+          'goods_id':item.goods_id
+        }).then(res=>{
+          this.popData.goodsItem=item
+          if(this.popData.goods_id!==item.goods_id){
+            this.popData.goods_id=item.goods_id
+            this.popData.spec_name=[]
+            this.popData.price='0.00'
+            this.popData.line_price=''
+            this.popData.spec_key=''
+            this.popData.num=0
+            this.popData.spec_ids=[]
+          }
+          this.popData.spec_list=res.data.spec_list
+          this.popData.spec_attr=res.data.spec_attr
+          this.$refs.popupGG.open();
+          this.setGoodsSpecPrice()
+          this.isAjax=false
+        }).catch(()=>{
+          tools.error('规格信息异常')
+          this.isAjax=false
+        })
+      },
+      setGoodsSpecPrice(){
+        if(this.popData.spec_ids.length>0){
+          let spec_ids=JSON.parse(JSON.stringify(this.popData.spec_ids))
+          spec_ids.sort((a, b) => a - b);
+          let spec_key=spec_ids.join('_')
+          this.popData.spec_key=spec_key
+          console.log(this.popData.spec_list[spec_key])
+          if(this.popData.spec_list[spec_key]!==undefined){
+            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
+            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===row.goods_spec_id)
+            if(cartKey>=0){
+              this.popData.num=this.cartData.goods_list[cartKey].goods_number
+            }
+          }
+        }
+      },
+      setShopIngList(cartData){
+        this.cartData=cartData
+        this.setGoodsNum()
+      },
+      getShopIngList(isStart){
+        getShopIngList({
+          'shop_id':this.shop_id,
+        }).then(res=>{
           if(res.code===1){
             this.cartData=res.data
+            this.$emit('setCartData',this.cartData)
+           if(isStart) this.setGoodsNum()
           }
         })
       },
-      // getShopCategory(){
-      //   if(this.shop_id<0 || !this.operate_id){
-      //     return;
-      //   }
-      //   shopCategory({'shop_id':this.shop_id,	operate_id: this.operate_id,}).then(res=>{
-      //     if(res.code===1){
-      //       for (const cKey in res.data) {
-      //         let item =res.data[cKey]
-      //         item.goodsList=[]
-      //         this.categoryData.push(item)
-      //         if(cKey===0){
-      //           this.selectType(item)
-      //         }
-      //       }
-      //       this.getShopGoods()
-      //     }
-      //   })
-      // },
+      setGoodsNum(){
+        if(this.cartData.goods_list.length>0){
+          this.cartData.goods_list.forEach(item=>{
+            this.categoryData.forEach(categoryItem=>{
+              if(categoryItem.type===item.category_id){
+                categoryItem.list.forEach(goodsItem=>{
+                  console.log(item.goods_id,goodsItem.goods_id)
+                  if(item.goods_id===goodsItem.goods_id){
+                    goodsItem.num=item.goods_number*1
+                  }
+                })
+              }
+
+            })
+          })
+        }else {
+          //购物车数据清除
+          this.categoryData.forEach(categoryItem=>{
+            categoryItem.list.forEach(goodsItem=>{
+              goodsItem.num=0
+            })
+          })
+        }
+      },
       getShopGoods(){
           if(this.shop_id<0 || !this.operate_id){
             return;
@@ -282,66 +313,105 @@
 				}).exec();
 			},
 			addred(type, i, k, item) {
-        console.log(item,type)
+        if(this.isAjax){
+          return
+        }
+        this.isAjax=true
 				if (type === 1) {
 					// 减
           if(item.num>0){
             --item.num;
-            // this.menuList[i].list[k].num -= 1;
-            this.setSub(item);
+            this.setSub(item,type);
+          }else {
+            this.isAjax=false
           }
 
 				} else if (type === 2) {
 					// 加
-          console.log(item.is_infinite===1 || item.stock>item.num)
           if(item.is_infinite===1 || item.stock>item.num){
             ++item.num;
-            this.setSub(item);
+            this.setSub(item,type);
+          }else {
+            this.isAjax=false
           }
-          console.log(item.num)
 					// this.menuList[i].list[k].num += 1;
 					// this.setSub(item);
 				} else if (type === 3) {
 					// 选规格
-					this.$refs.popupGG.open();
+          this.getShopGoodsSpec(item)
 				} else {
 					this.$refs.popupGG.close();
+          this.isAjax=false
 				}
 			},
-			setSub(item) {
-				// let num = 0;
-				// item.list.forEach((n) => {
-				// 	num += n.num
-				// })
-				// this.typeList.forEach((v) => {
-				// 	if (v.type == item.type) {
-				// 		v.num = num
-				// 	}
-				// })
+
+
+			setSub(item,type) {
+        let cartKey=this.cartData.goods_list.findIndex(row=>row.goods_id===item.goods_id)
+        if(type===2 && cartKey<0){
+          this.setShopIngAdd(item.goods_id,item.category_id,'')
+        }else {
+          this.setShopIngNumber(item.goods_id,item.category_id,type,'')
+        }
+
 			},
+      setShopIngAdd(goodsId,categoryId,goodsSpecId){
+        setShopIngAdd({
+          'type':1,
+          'goods_id':goodsId,
+          'shop_id':this.shop_id,
+          'category_id':categoryId,
+          'goods_spec_id':goodsSpecId,
+        }).then(res=>{
+          this.isAjax=false
+          this.getShopIngList()
+        }).catch(()=>{
+          this.isAjax=false
+        })
+      },
+      setShopIngNumber(goodsId,categoryId,operation,goodsSpecId){
+        setShopIngNumber({
+          'type':1,
+          'goods_id':goodsId,
+          'shop_id':this.shop_id,
+          'category_id':categoryId,
+          'goods_spec_id':goodsSpecId,
+          'operation':operation===2?1:2,
+        }).then(res=>{
+          this.isAjax=false
+          this.getShopIngList()
+        }).catch(()=>{
+          this.isAjax=false
+        })
+      },
+
+      setShopIngDel(){
+
+      },
 
 			// -------弹窗选择规格-----------
-			select(i, k, item, info) {
-				if (!info.isSelect) {
-					item.list.forEach((v) => {
-						v.isSelect = false;
-					})
-					info.isSelect = true;
-
-					item.list.forEach(v => {
-						this.popData.spec_list.forEach((n, i) => {
-							if (v.id == n) {
-								this.popData.spec_list.splice(i, 1)
-							}
-						})
-					})
-					this.popData.spec_list.push(info.id);
-				} else {
-					info.isSelect = false;
-					let index = this.popData.spec_list.indexOf(info.id)
-					this.popData.spec_list.splice(index, 1)
-				}
-				this.spec_ids = this.popData.spec_list.join('_')
+			selectSpec( info,groupKey) {
+          let  specKey=this.popData.spec_ids.indexOf(info.item_id)
+        if(specKey>=0){
+          this.popData.spec_ids.splice(specKey,1)
+          this.popData.spec_name.splice(specKey,1)
+        }else {
+          this.popData.spec_ids.push(info.item_id)
+          this.popData.spec_name.push(info.spec_value)
+          for (const attrKey in this.popData.spec_attr[groupKey].spec_items) {
+            if(this.popData.spec_attr[groupKey].spec_items[attrKey].item_id!==info.item_id){
+              let  oldKey=this.popData.spec_ids.indexOf(this.popData.spec_attr[groupKey].spec_items[attrKey].item_id)
+              if(oldKey>=0){
+                this.popData.spec_ids.splice(oldKey,1)
+                this.popData.spec_name.splice(oldKey,1)
+              }
+            }
+
+          }
+
+        }
+				// this.spec_ids = this.popData.spec_list.join('_')
+        this.setGoodsSpecPrice()
 
 			},
 		},

pages-takeout/shop.vue

@@ -58,7 +58,7 @@
 
 
 		<view class="common-view-css bgc-f" style="overflow: hidden;">
-			<Menu style="height: 100%;" v-if="shopType === 1"  :shop_id="shop_id"></Menu>
+			<Menu style="height: 100%;" v-if="shopType === 1"  :shop_id="shop_id" @setCartData="setCartData" ref="goodsMenu"></Menu>
 			<Evaluate style="height: 100%;" :shopId='shop_id' :shopScore='shopsInfo.shop_score' v-else-if="shopType === 2"></Evaluate>
 			<ShopInfo style="height: 100%;" :shopId='shop_id' v-else-if="shopType === 3"></ShopInfo>
 		</view>
@@ -66,17 +66,17 @@
 		<view class="shop-buttom-money box-border-box" @click="openBuyCrad()">
 			<view class="shop-buttom-money-1 flex-justify-space align-items-center">
 				<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
-				<view class="shop-buttom-num fs-24 fc-f text-align-center">3</view>
-				<view class="">
-					<view class="">
-						<span class="fw-600 fs-24 fc-f">￥</span>
-						<span class="fw-600 fs-44 fc-f">19.26</span>
-					</view>
-					<!-- <view class="fs-24 fc-ADADAD">免配送</view> -->
-					<view class="fs-24 fc-ff3939">配送费￥10</view>
-				</view>
-				<view class="fs-32 fw-600 fc-f mr-30">20元起送</view>
-				<!-- <view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600">去结算</view> -->
+				<view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
+        <view class="" v-if="cartData.is_place_order===1">
+          <view class="">
+            <span class="fw-600 fs-24 fc-f">￥</span>
+            <span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
+          </view>
+          <view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
+          <view class="fs-24 fc-ff3939" v-else>配送费￥{{delivery_money}}</view>
+        </view>
+        <view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
+				 <view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600">去结算</view>
 			</view>
 		</view>
 
@@ -85,51 +85,52 @@
 				<view class="buy-card-top box-border-box plr-32 flex-justify-space align-items-center">
 					<view class="">
 						<span class="fs-32 fc-3 mr-12">已选商品</span>
-						<span class="fs-32 fc-9">(打包费<span class="fs-32 fc-FB3D03">8元</span>)</span>
+						<span class="fs-32 fc-9">(打包费<span class="fs-32 fc-FB3D03">{{cartData.pack_price}}元</span>)</span>
 					</view>
 					<view class="fs-28 fw-400 fc-9 align-items-center">
 						<view class="">
 							<uni-icons type="trash" size="18" color="#999"></uni-icons>
 						</view>
-						<view class="fs-28 fw-400 fc-9">清空</view>
+						<view class="fs-28 fw-400 fc-9" @click.stop="setShopIngDel">清空</view>
 					</view>
 				</view>
 				<view class="scroll-view-css box-border-box p-32">
-					<view class="buy-card-item display-flex" v-for="(item,i) in 5" :key="i">
-						<image src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+					<view class="buy-card-item display-flex" v-for="(goods,i) in cartData.goods_list" :key="i">
+						<image :src="goods.goods_image" mode="scaleToFill"></image>
 						<view class="flex-1">
 							<view class="w-514 text-overflow-ellipsis-one fs-34 fw-600 mb-12">
-								[畅销款]奥尔1良烤肉牛油拌饭拌饭[畅销款]奥尔1良烤肉牛油拌饭拌饭</view>
-							<view class="w-514 text-overflow-ellipsis-one fs-24 fw-400 fc-9 mb-18">不辣，加辣</view>
+                {{goods.goods_name}}</view>
+							<view class="w-514 text-overflow-ellipsis-one fs-24 fw-400 fc-9 mb-18">{{goods.goods_attr}}</view>
 
 							<view class="flex-justify-space">
 								<view class="">
 									<span class="fs-24 fc-FB3D03 fw-400">￥</span>
-									<span class="fs-40 fc-FB3D03 fw-b">3.99</span>
+									<span class="fs-40 fc-FB3D03 fw-b">{{goods.price}}</span>
 								</view>
 								<view class="display-flex align-items-center">
-									<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f">-</view>
-									<view class="right-only-right-2 text-align-center fs-28 fw-400">1</view>
-									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f">+</view>
+									<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click.stop="setShopIngNumber(goods,2)">-</view>
+									<view class="right-only-right-2 text-align-center fs-28 fw-400">{{goods.goods_number}}</view>
+									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click.stop="setShopIngNumber(goods,1)">+</view>
 								</view>
 							</view>
 						</view>
 					</view>
+          <en-blank v-if="cartData.goods_list.length<=0" message="快去选购商品吧！~"></en-blank>
 				</view>
 
 				<view class="shop-buttom-money box-border-box" @click="createOrder()">
 					<view class="shop-buttom-money-1 flex-justify-space align-items-center">
 						<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
-						<view class="shop-buttom-num fs-24 fc-f text-align-center">3</view>
-						<view class="">
+						<view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
+						<view class="" v-if="cartData.is_place_order===1">
 							<view class="">
 								<span class="fw-600 fs-24 fc-f">￥</span>
-								<span class="fw-600 fs-44 fc-f">19.26</span>
+								<span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
 							</view>
-							<!-- <view class="fs-24 fc-ADADAD">免配送</view> -->
-							<view class="fs-24 fc-ff3939">配送费￥10</view>
+							 <view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
+							<view class="fs-24 fc-ff3939" v-else>配送费￥{{delivery_money}}</view>
 						</view>
-						<!-- <view class="fs-32 fw-600 fc-f mr-30">20元起送</view> -->
+						 <view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
 						<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600" @click="toConfirmOrder()">
 							去结算</view>
 					</view>
@@ -197,6 +198,8 @@
 		shopInfo,
 		shopCoupon
 	} from "@/api/shop.js"
+  import {getDeliveryMoney} from "@/api/common";
+  import {getShopIngList, setShopIngDel, setShopIngNumber} from "@/api/shopping";
 	export default {
 		components: {
 			Menu,
@@ -225,6 +228,18 @@
 				couponData: [], // 可领优惠卷
 				goodsData: [], // 可领优惠卷
         categoryData: [], // 可领优惠卷
+        delivery_money: 0, // 可领优惠卷
+        cartData: {
+          total_price:0,
+          total_num:0,
+          total_goods_money:0,
+          pack_price:0,
+          must_category:0,
+          is_place_order:0,
+          err_msg:0,
+          goods_list:[],
+        },
+        isAjax:false
 			}
 		},
 		onLoad(e) {
@@ -239,6 +254,74 @@
 			this.shopCoupon()
 		},
 		methods: {
+      setShopIngDel(){
+        uni.showModal({
+          title: '提示',
+          content: '是否清除购物车商品？',
+          success: (res) => {
+            console.log(res)
+            if (res.confirm) {
+
+              setShopIngDel({
+                'shop_id': this.shop_id,
+                'type': 1,
+              }).then((res) => {
+                if (res.code === 1) {
+                 tools.success(res.msg)
+                  this.getShopIngList()
+                } else {
+                  tools.error(res.msg)
+                }
+              })
+            }
+          }
+        });
+      },
+      setShopIngNumber(item,type){
+        if(this.isAjax){
+          return
+        }
+        this.isAjax=true
+        setShopIngNumber({
+          'type':1,
+          'goods_id':item.goods_id,
+          'shop_id':this.shop_id,
+          'category_id':item.category_id,
+          'goods_spec_id':item.goods_spec_id,
+          'operation':type===1?1:2,
+        }).then(res=>{
+          this.isAjax=false
+          this.getShopIngList()
+        }).catch(()=>{
+          this.isAjax=false
+        })
+      },
+      getShopIngList(){
+        getShopIngList({
+          'shop_id':this.shop_id,
+        }).then(res=>{
+          if(res.code===1){
+            this.cartData=res.data
+            if(this.shopType===1){
+              this.$refs.goodsMenu.setShopIngList( this.cartData)
+            }
+          }
+        })
+      },
+      setCartData(cartData){
+        this.cartData=cartData
+        this.getDeliveryMoney()
+      },
+      getDeliveryMoney(){
+        getDeliveryMoney({
+          'school_id':this.operate_id,
+          'shop_id':this.shop_id,
+        }).then(res=>{
+          if(res.code===1){
+              this.delivery_money=res.data.delivery_money*1
+          }
+        })
+      },
 			receiveCode(item) {
 				receiveCoupon({grant_id: item.grant_id,coupon_id: item.coupon_id}).then((res) => {
 					if(res.code == 1) {

pages.json

@@ -408,10 +408,17 @@
 	},
 	"condition": {
 		"current": 0,
-		"list": [{
+		"list": [
+			{
 			"name": "列表调试",
 			"path": "pages-position/Internship-position",
 			"query": ""
-		}]
+		},
+			{
+				"name": "店铺详情",
+				"path": "pages-takeout/shop",
+				"query": "shop_id=1"
+			}
+		]
 	}
 }