toktok

toktok-admin-screen/config/prod.env.js

@@ -1,6 +1,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
-  BASE_API: '"http://stores.test.toktok.beer/tsa"'
-  // BASE_API: '"https://stores.toktok.beer/tsa"'
+  // BASE_API: '"http://stores.test.toktok.beer/tsa"'
+  BASE_API: '"https://stores.toktok.beer/tsa"'
 }

toktok-admin-screen/src/api/projection.js

@@ -99,6 +99,14 @@ export function snack_list(param) {
 		params: param
 	})
 }
+//菜品类型列表
+export function public_data_dishes_type(param) {
+	return request({
+		url: '/public_data/list/dishes_type',
+		method: 'get',
+		params: param
+	})
+}
 //新增啤酒
 export function beer_add(param) {
 	return request({
@@ -746,6 +754,14 @@ export function beer_box_manager_update(param) {
     params: param
   })
 }
+//上下架盲盒
+export function beer_box_manager_update_status(param) {
+  return request({
+    url: '/beer_box_manager/update/status',
+    method: 'post',
+    params: param
+  })
+}
 //新增或修改盲盒价格
 export function beer_box_manager_add_price(param) {
   return request({

toktok-admin-screen/src/views/toktok-stores/beer_box_manager.vue

@@ -8,13 +8,13 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="全部" name="first">
         <el-table :data="pageInfo.records" border stripe height="660" style="width: 100%;">
-          <el-table-column prop="boxId" label="盲盒id" width="100" />
+          <el-table-column prop="beerBoxId" label="盲盒id" width="100" />
           <el-table-column prop="boxName" label="盲盒名"/>
-          <el-table-column label="盲盒主题">
+          <!-- <el-table-column label="盲盒主题">
             <template slot-scope="scope">
               <span>{{scope.row.subject.subName}}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="循环类型" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.loopType==0">月循环</span>
@@ -23,17 +23,17 @@
           </el-table-column>
           <el-table-column prop="currBoxNo" label="当前盲盒期数"/>
           <el-table-column prop="cutOffTime" label="截止时间"/>
-          <el-table-column label="价格列表" width="120">
+          <el-table-column label="价格列表" >
             <template slot-scope="scope">
               <div style="display: flex;flex-direction: column;">
                 <div v-for="item in scope.row.priceList" :key="item.priceId" style="border: 1px solid;">
                   <el-link type="primary" @click="editPri(scope.row, item)">{{item.productCunt +'个'+ unitTypeFor(item.unitType) +'-￥'+ item.price}}</el-link>
                 </div>
-                <el-button type="primary" size="mini" @click="toAddPri(scope.row.boxId)" style="margin-top:20px;">新增</el-button>
+                <el-button type="primary" size="mini" @click="toAddPri(scope.row.beerBoxId)" style="margin-top:20px;">新增</el-button>
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="精酿列表" width="100">
+          <!-- <el-table-column label="精酿列表" width="100">
             <template slot-scope="scope">
               <div style="display: flex;flex-direction: column;">
                 <span v-for="item in scope.row.skuList" :key="item.skuId" style="border: 1px solid;">
@@ -48,9 +48,18 @@
             <template slot-scope="scope">
               <span v-if="scope.row.desList.length>0">{{scope.row.desList.join(';')}}</span>
             </template>
-          </el-table-column>
-          <el-table-column label="操作" width="100" fixed="right">
+          </el-table-column> -->
+          <el-table-column label="状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.status==0">上架</span>
+              <span v-else-if="scope.row.status==1">已截止</span>
+              <span v-else-if="scope.row.status==2">下架</span>
+            </template>
+          </el-table-column> -->
+          <el-table-column label="操作" width="220" fixed="right">
             <template slot-scope="scope">
+              <el-button v-if="scope.row.status==1||scope.row.status==2" type="success" plain @click="updateStatus(scope.row.beerBoxId, 1)">上架</el-button>
+              <el-button v-if="scope.row.status==0" type="danger" plain @click="updateStatus(scope.row.beerBoxId, 2)">下架</el-button>
               <el-button type="primary" @click="edit(scope.row)">修改</el-button>
             </template>
           </el-table-column>
@@ -80,10 +89,10 @@
           <el-input v-model="params_beerBox.title" placeholder="请填写订阅标题" />
         </el-form-item>
         <el-form-item label="详情描述:" prop="title">
-          <el-input v-model="params_beerBox.details" placeholder="请填写详情描述" />
+          <el-input type="textarea" :rows="3" v-model="params_beerBox.details" placeholder="请填写详情描述" />
         </el-form-item>
         <el-form-item label="订阅说明:" prop="title">
-          <el-input v-model="params_beerBox.des" placeholder="订阅说明,多个之间用;分隔" />
+          <el-input type="textarea" :rows="3" v-model="params_beerBox.des" placeholder="订阅说明,多个之间用;分隔" />
         </el-form-item>
         <el-form-item label="选择啤酒:">
           <el-select v-model="skuIds_list" multiple filterable class="filter-item">
@@ -130,7 +139,8 @@
 </template>
 
 <script>
-import { beer_box_manager_list, public_data_subject, beer_box_manager_cansku, beer_box_manager_add, beer_box_manager_update, beer_box_manager_add_price } from '@/api/projection'
+import { beer_box_manager_list, public_data_subject, beer_box_manager_cansku, beer_box_manager_add,
+   beer_box_manager_update, beer_box_manager_add_price, beer_box_manager_update_status } from '@/api/projection'
 import { deepClone, parseTime } from '@/utils'
 import { scrollTo } from '@/utils/scrollTo'
 
@@ -170,7 +180,7 @@ export default {
       },
       dialogVisible_addprice: false,
       params_price: {
-        boxId: null,
+        beerBoxId: null,
         count: null,
         price: null,
         maxNum: 1
@@ -183,6 +193,11 @@ export default {
     this.getBeerSKUData();
   },
   methods: {
+    updateStatus(beerBoxId, status) {
+      beer_box_manager_update_status({beerBoxId: beerBoxId, status: status}).then((res) => {
+        this.$notify.success({ title: '更新成功' })
+      })
+    },
     setPri() {
       beer_box_manager_add_price(this.params_price).then((res) => {
         this.$notify.success({ title: '更新成功' })
@@ -192,7 +207,7 @@ export default {
     },
     editPri(row, item) {
       this.params_price = {
-        boxId: row.boxId,
+        beerBoxId: row.beerBoxId,
         priceId: item.priceId,
         count: item.productCunt,
         price: item.price,
@@ -200,9 +215,9 @@ export default {
       }
       this.dialogVisible_addprice = true;
     },
-    toAddPri(boxId) {
+    toAddPri(beerBoxId) {
       this.params_price = {
-        boxId: boxId,
+        beerBoxId: beerBoxId,
         count: null,
         price: null,
         maxNum: 1
@@ -249,7 +264,7 @@ export default {
         return  item.boxBeerNum
       })
       this.params_beerBox = {
-        boxId: row.boxId,
+        beerBoxId: row.beerBoxId,
         subId: row.subject.subId,
         boxName: row.boxName,
         title: row.title,

toktok-admin-screen/src/views/toktok-stores/beer_box_order.vue

@@ -3,14 +3,14 @@
 
     <div class="filter-container">
       <el-input v-model="listQuery.orderNo" placeholder="订单号" style="width: 200px;" class="filter-item" type="text" @keyup.enter.native="handleFilter" />
-      <el-input v-model="listQuery.beerBoxName" placeholder="盲盒名" style="width: 200px;" class="filter-item" type="text" @keyup.enter.native="handleFilter" />
+      <el-input v-model="listQuery.beerBoxId" placeholder="盲盒id" style="width: 200px;" class="filter-item" type="text" @keyup.enter.native="handleFilter" />
       <el-input v-model="listQuery.userId" placeholder="用户id" style="width: 200px;" class="filter-item" type="text" @keyup.enter.native="handleFilter" />
       <el-input v-model="listQuery.name" placeholder="收货人姓名" style="width: 200px;" class="filter-item" type="text" @keyup.enter.native="handleFilter" />
       <el-button size="medium" @click="handleFilter" type="primary">搜索</el-button>
     </div>
 
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="待支付" name="待支付">
+      <el-tab-pane label="进行中" name="进行中">
         <el-table :data="pageInfo.records" border stripe height="660" style="width: 100%;">
           <el-table-column prop="orderNo" label="订单号"/>
           <el-table-column prop="beerBoxName" label="盲盒名" />
@@ -24,7 +24,7 @@
           <el-table-column prop="gmtModified" label="更新时间" width="100" />
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="进行中" name="进行中">
+      <el-tab-pane label="待支付" name="待支付">
         <el-table :data="pageInfo.records" border stripe height="660" style="width: 100%;">
           <el-table-column prop="orderNo" label="订单号"/>
           <el-table-column prop="beerBoxName" label="盲盒名" />
@@ -134,9 +134,9 @@ import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
-      activeName: '待支付',
+      activeName: '进行中',
       listQuery: {
-        status: '1',
+        status: '2',
         currentPage: 1,
         pageSize: 20
       },

toktok-admin-screen/src/views/toktok-stores/dishes_manage.vue

@@ -82,7 +82,7 @@
         </el-table>
       </el-tab-pane>
 
-      <el-tab-pane label="咖啡" name="3">
+      <el-tab-pane label="威士忌" name="8">
         <el-table :data="pageInfo.records" border stripe height="660" style="width: 100%;">
           <el-table-column prop="dishesId" label="id" width="100" />
           <el-table-column prop="name" label="名称" width="200"/>
@@ -115,7 +115,7 @@
         </el-table>
       </el-tab-pane>
 
-      <el-tab-pane label="主食" name="4">
+      <el-tab-pane label="鸡尾酒" name="9">
         <el-table :data="pageInfo.records" border stripe height="660" style="width: 100%;">
           <el-table-column prop="dishesId" label="id" width="100" />
           <el-table-column prop="name" label="名称" width="200"/>
@@ -181,6 +181,39 @@
         </el-table>
       </el-tab-pane>
 
+      <el-tab-pane label="主食" name="4">
+        <el-table :data="pageInfo.records" border stripe height="660" style="width: 100%;">
+          <el-table-column prop="dishesId" label="id" width="100" />
+          <el-table-column prop="name" label="名称" width="200"/>
+          <el-table-column prop="englishName" label="英文名称" width="200"/>
+          <el-table-column label="图片" width="120">
+            <template slot-scope="scope">
+              <img :src="scope.row.img" style="width: 80px;">
+            </template>
+          </el-table-column>
+          <el-table-column label="是否主打" width="80">
+            <template slot-scope="scope">
+              <div>{{scope.row.featured==1?'是':'否'}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格\价格:" width="220" >
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.dishesSpecifications" :key="item.specificationId">
+                <label>{{item.name}}-{{item.price}}(原){{item.vipPrice?'-'+item.vipPrice+'(vip)':null}}</label>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="120" fixed="right">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.saleStatus==1" @click="stopSaleSnack(scope.$index, scope.row)" type="primary">停售</el-button>
+              <el-button v-if="scope.row.saleStatus==2" @click="startSaleSnack(scope.$index, scope.row)" type="success">启售</el-button>
+              <el-button @click="edit_snack(scope.$index, scope.row)" style="margin-left:0;margin-top:10px;">修改</el-button>
+              <el-button type="danger" @click="dishesDelete(scope.$index, scope.row.dishesId)" style="margin-left:0;margin-top:10px;">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
     </el-tabs>
 
     <el-dialog :visible.sync="dialogVisible_addBeer" title="新增酒品" top="32px">
@@ -211,7 +244,7 @@
         <el-form-item label="" prop="">
           <img v-if="beer_params.img" :src="beer_params.img" style="width:100px;height: auto;" alt="">
         </el-form-item>
-        <el-form-item label="菜品名称:"> 
+        <el-form-item label="菜品名称:">
           <el-input v-model="beer_params.name" placeholder="请填写啤酒名" style="width:200px"/>
         </el-form-item>
         <el-form-item label="英文名:">
@@ -260,7 +293,7 @@
         <el-form-item label="" prop="">
           <img v-if="snack_params.img" :src="snack_params.img" style="width:100px;height: auto;" alt="">
         </el-form-item>
-        <el-form-item label="菜品名称:"> 
+        <el-form-item label="菜品名称:">
           <el-input v-model="snack_params.name" placeholder="请填写菜品名" style="width:200px"/>
         </el-form-item>
         <el-form-item label="英文名:">
@@ -312,7 +345,9 @@
 </template>
 
 <script>
-import { beer_list, snack_list, beer_add, snack_add, upload_file, specification_manage_list, beer_update, snack_update, dishes_remove, beer_unbound_menu_list } from '@/api/projection'
+import { beer_list, snack_list, beer_add, snack_add, upload_file,
+  specification_manage_list, beer_update, snack_update, dishes_remove,
+  beer_unbound_menu_list, public_data_dishes_type } from '@/api/projection'
 import { deepClone, parseTime } from '@/utils'
 import { scrollTo } from '@/utils/scrollTo'
 
@@ -349,21 +384,7 @@ export default {
           vipPrice: ''
         }
       ],
-      classify_list: [
-        {
-          name: '小吃',
-          value: '2'
-        },{
-          name: '咖啡',
-          value: '3'
-        },{
-          name: '主食',
-          value: '4'
-        },{
-          name: '烘焙',
-          value: '5'
-        }
-      ],
+      classify_list: [],
       featured_list: [
         {
           name: '是',
@@ -404,6 +425,7 @@ export default {
     this.loadDatas();
     this.loadSpecification_List();
     this.unboundMenuBeer_List();
+    this.get_dishes_type();
   },
   methods: {
     stopSaleSnack(index, row) {
@@ -504,7 +526,7 @@ export default {
           englishName: row.englishName,
           featured: row.featured.toString(),
           img: row.img,
-          type: row.type.toString(),
+          type: row.type,
           saleStatus: row.saleStatus.toString(),
           specificationIds: '',
           prices: '',
@@ -604,7 +626,7 @@ export default {
       this.beer_params.specificationIds = specificationId_array.join(';');
       this.beer_params.prices = price_array.join(';');
       this.beer_params.vipPrices = vipPrices_array[0] ? vipPrices_array.join(';') : null;
-      
+
       if(this.edit_status) {
         beer_update(this.beer_params).then((res) => {
           console.log(res);
@@ -739,7 +761,7 @@ export default {
         this.$message({
           type: 'info',
           message: '已取消删除'
-        });          
+        });
       });
     },
     handleClick(tab, event) {
@@ -758,6 +780,12 @@ export default {
       } else if (tab.name === '5') {
         this.listQuery.type = '5';
         this.loadDatas();
+      } else if (tab.name === '8') {
+        this.listQuery.type = '8';
+        this.loadDatas();
+      } else if (tab.name === '9') {
+        this.listQuery.type = '9';
+        this.loadDatas();
       }
     },
     // 获取规格数据
@@ -776,6 +804,11 @@ export default {
     handleFilter() {
       this.loadDatas();
     },
+    get_dishes_type() {
+      public_data_dishes_type().then((res) => {
+        this.classify_list = res.data.data;
+      })
+    },
     // 获取数据
     loadDatas() {
       if (this.activeName == '1') {

toktok-admin-screen/src/views/toktok-stores/projection.vue

@@ -634,6 +634,10 @@ export default {
 			name: '啤酒(6)',
 			value: '5'
 			},
+      {
+			name: '鸡尾酒',
+			value: '6'
+			},
 		],
 		dialogVisible_add: false,
 		dialogVisible: false,
@@ -1183,6 +1187,9 @@ export default {
 				case 5:
 				return '啤酒(6)'
 				break;
+        case 6:
+				return '鸡尾酒'
+				break;
 				default:
 				return ''
 			}

toktok-admin-screen/src/views/toktok-stores/stores_menu_manage.vue

@@ -69,7 +69,9 @@
 </template>
 
 <script>
-import { store_list, stores_menu_list, stores_menu_add, stores_menu_remove, stores_menu_update, stores_menu_update_store, stores_menu_update_sort_by, all_store_update } from '@/api/projection'
+import { store_list, stores_menu_list, stores_menu_add, stores_menu_remove,
+   stores_menu_update, stores_menu_update_store, stores_menu_update_sort_by,
+    all_store_update, public_data_dishes_type } from '@/api/projection'
 import { deepClone, parseTime } from '@/utils'
 import { scrollTo } from '@/utils/scrollTo'
 
@@ -78,36 +80,13 @@ export default {
     return {
       listQuery: {
         storeId: null,
-        type: '1',
+        type: 1,
         status: 'On',
         currentPage: 1,
         pageSize: 100,
       },
       storeList: [],
-      typeList: [
-        {
-          name: '啤酒',
-          value: '1'
-        },{
-          name: '小吃',
-          value: '2'
-        },{
-          name: '咖啡',
-          value: '3'
-        },{
-          name: '主食',
-          value: '4'
-        },{
-          name: '烘焙',
-          value: '5'
-        },{
-          name: '酸奶',
-          value: '6'
-        },{
-          name: '轻食',
-          value: '7'
-        }
-      ],
+      typeList: [      ],
       statusList: [
         {
           name: '上架',
@@ -126,6 +105,8 @@ export default {
   },
   mounted() {
     this.loadStoreList();
+    this.get_dishes_type();
+
   },
   methods: {
     OneClickUpdate() {
@@ -212,10 +193,15 @@ export default {
       store_list().then((res) => {
         console.log(res.data.data);
         this.storeList = res.data.data;
-        this.listQuery.storeId = res.data.data[0].storeId;   
+        this.listQuery.storeId = res.data.data[0].storeId;
         this.loadDatas();
       })
     },
+    get_dishes_type() {
+      public_data_dishes_type().then((res) => {
+        this.typeList = res.data.data;
+      })
+    },
     // 获取数据
     loadDatas() {
       stores_menu_list(this.listQuery).then((res) => {

toktok-index/config/index.js

@@ -20,7 +20,7 @@ module.exports = {
     notifyOnErrors: true,
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
 
-    
+
     /**
      * Source Maps
      */

toktok-index/src/action/net.js

@@ -3,7 +3,7 @@ import qs from 'qs'
 
 // axios.defaults.baseURL =  'http://toktok.xsbanruo.com';   //配置接口地址-测试
 // axios.defaults.baseURL =  'http://test.toktok.beer';   //配置接口地址-测试
-axios.defaults.baseURL =  'http://toktok.beer';   //配置接口地址-生产
+axios.defaults.baseURL =  '//toktok.beer';   //配置接口地址-生产
 axios.defaults.timeout = 5000;  //响应时间
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';  //配置请求头
 axios.defaults.headers.common["Auth-User-Agent"] = "H5#H5#H5#201#201";
@@ -85,11 +85,11 @@ export default {
                 ],
             });
             wx.ready(function () {
-                console.log('sucess');
+                console.log('sucess_wx');
             });
             wx.error(function (err) {
                 // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
-                console.log('err', err);
+                console.log('err_wx', err);
             });
         }).catch((err)=>{
             console.log(err)

toktok-index/src/components/mobile_index.vue

@@ -143,42 +143,58 @@ export default {
             videoStatus: false,
             storeList: [
                 {
-                    name: '星寰广场店',
+                    name: '市二宫店',
                     tags: '新店',
-                    ad: '越秀区侨光西路11号星寰国际商业广场负一楼（南门旋转楼梯附近）',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广州市海珠区江南大道中89号之四6998LUCK B114铺（负一层）',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-menu/pages/menu/index.html?shopId=601086122&restaurantViewId=172288&cacheKey=1405742492195807307_601086122_5.43.02&wxAppVersion=5.43.02&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                    path: 'diancan-menu/pages/menu/index.html?newAdvance=false&reserveMode=0&payOpenId=&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=601426200&tableNum=29866410&brandId=&authGeo=undefined'
                 },
                 {
-                    name: '设计之都店',
+                    name: '龙洞店',
                     tags: '新店',
-                    ad: '广州市白云区鹤龙街道白云区黄边北路150号设计之都时光汇1030铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广州市天河区迎龙路1号1160室',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-main/pages/main/index.html?multiShop=1&scanId=1673084916430-56557-9712&reserveMode=0&t=1673084916416&shopId=600795330&uuid=null&payMode=1&entrance=43&fromShopList=1&sign=ef3154265655d2c865371acfe2271f77&tenantId=10215149&qrcodeType=null&paySource=152&newAdvance=true&bizType=1&funcMode=1&autoTakeOrder=1&payOpenId=&accountMode=2&tableNum=&bizMode=1&dishSource=0&orderBizTag=1&scene=0'
+                    path: 'diancan-menu/pages/menu/index.html?shopId=600326998&restaurantViewId=172288&cacheKey=1405742492195807307_600326998_5.54.05&wxAppVersion=5.54.05&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
                 },
                 {
-                    name: '诺德中心店',
+                    name: '花地湾店',
                     tags: '新店',
-                    ad: '广州市番禺区南村镇汉溪大道东477号中铁诺德中心101铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广东省广州市荔湾区东漖北路与浣花路交汇东北',
+                    time: '营业时间：早08:10-晚23:59',
+                    opening: true,
+                    path: 'diancan-menu/pages/menu/index.html?shopId=600450711&restaurantViewId=172288&cacheKey=1405742492195807307_600450711_5.54.05&wxAppVersion=5.54.05&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                },
+                {
+                    name: '星寰广场店',
+                    tags: '',
+                    ad: '越秀区侨光西路11号星寰国际商业广场负一楼（南门旋转楼梯附近）',
+                    time: '营业时间：早08:10-晚23:59',
+                    opening: true,
+                    path: 'diancan-menu/pages/menu/index.html?shopId=601086122&restaurantViewId=172288&cacheKey=1405742492195807307_601086122_5.43.02&wxAppVersion=5.43.02&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                },
+                {
+                    name: '设计之都店',
+                    tags: '',
+                    ad: '广州市白云区鹤龙街道白云区黄边北路150号设计之都时光汇1030铺',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=600543595&tableNum=16226509'
+                    path: 'diancan-main/pages/main/index.html?multiShop=1&scanId=1673084916430-56557-9712&reserveMode=0&t=1673084916416&shopId=600795330&uuid=null&payMode=1&entrance=43&fromShopList=1&sign=ef3154265655d2c865371acfe2271f77&tenantId=10215149&qrcodeType=null&paySource=152&newAdvance=true&bizType=1&funcMode=1&autoTakeOrder=1&payOpenId=&accountMode=2&tableNum=&bizMode=1&dishSource=0&orderBizTag=1&scene=0'
                 },
                 {
                     name: '合生广场店',
-                    tags: '新店',
+                    tags: '',
                     ad: '广州市海珠区叠景路168号170号合生广场101房之九铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?scanId=1661332908472-7456-271&reserveMode=0&t=1661332908457&shopId=600643920&uuid=1rPdk9z3Ccm&payMode=2&entrance=80&sign=cf76d299b0a24bb9d030a6283ba77033&tenantId=10215149&qrcodeType=1&funcMode=1&bizType=0&autoTakeOrder=1&accountMode=2&payOpenId=&tableNum=18216011&dishSource=0&bizMode=1&perceptionPage=true&orderBizTag=0&scene=0'
                 },
                 {
                     name: '天河新天地店',
-                    tags: '新店',
+                    tags: '',
                     ad: '广州市天河区天源路5号天河新天地首层L137号商铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=600348263&tableNum=16226229'
                 },
@@ -186,7 +202,7 @@ export default {
                     name: '天河北店',
                     tags: '',
                     ad: '广州市天河区天河北路628号保利中宇广场首层301铺之二',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?scanId=1652758167418-1379-48137&reserveMode=0&t=1652758167398&shopId=600561713&uuid=1okujH21msd&payMode=2&entrance=80&sign=21238d9ffc4af689ac62322171fa521a&tenantId=10215149&qrcodeType=1&funcMode=1&bizType=0&autoTakeOrder=0&accountMode=1&payOpenId=null&tableNum=16226310&dishSource=0&bizMode=1&perceptionPage=true&orderBizTag=0&scene=0'
                 },
@@ -194,7 +210,7 @@ export default {
                     name: '黄埔古港店',
                     tags: '',
                     ad: '广州市海珠区石基路512号古港新地C1079-1080（黄埔古港景观区旁）',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=600515518&tableNum=15122827'
                 },
@@ -202,7 +218,7 @@ export default {
                     name: '广州荔枝湾店',
                     tags: '',
                     ad: '广州市荔湾区龙津西路94号古玩城D103铺（荔枝湾景区旁）',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?payOpenId=null&minaId=&newAdvance=false&orderBizTag=0&reserveMode=0&restaurantViewId=&tenantId=10215149&tableNum=14489292&paySource=null&spuId=&shopId=600509146&entrance=40'
                 },
@@ -210,18 +226,18 @@ export default {
                     name: '米酷店（万科云城)',
                     tags: '',
                     ad: '广州市天河区万科云城米酷B4栋107、108铺（近天河智慧城地铁B出口）',
-                    time: '营业时间：晚18:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=null&minaId=&spuId=&orderBizTag=0&shopId=600343939&tableNum=10732595',
                 },
                 {
-                    name: '万胜围店（琶洲新村)',
+                    name: '黄埔南村店',
                     tags: '',
-                    ad: '广州市海珠区琶洲新村11栋02商铺（近万胜围地铁D出口)',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广州市百合三街 6 号 101 铺',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-menu/pages/menu/index?scanId=1644378887937-44094-11856&reserveMode=0&t=1644378887934&shopId=600326998&uuid=1dtVjGTyGt8&payMode=1&entrance=80&sign=37403c5500a2712605c4349ce43595a2&tenantId=10215149&qrcodeType=1&funcMode=1&bizType=0&autoTakeOrder=1&accountMode=2&payOpenId=null&tableNum=10488457&dishSource=0&bizMode=1&perceptionPage=true&orderBizTag=0&scene=1401'
-                }
+                    path: 'diancan-menu/pages/menu/index.html?shopId=600576175&restaurantViewId=172288&cacheKey=1405742492195807307_600576175_5.54.05&wxAppVersion=5.54.05&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                },
             ],
             tYear: null,
             isWechatStatus: false

toktok-index/src/components/pc_index.vue

@@ -133,42 +133,58 @@ export default {
             temporaryIndex: 0,
             storeList: [
                 {
-                    name: '星寰广场店',
+                    name: '市二宫店',
                     tags: '新店',
-                    ad: '越秀区侨光西路11号星寰国际商业广场负一楼（南门旋转楼梯附近）',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广州市海珠区江南大道中89号之四6998LUCK B114铺（负一层）',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-menu/pages/menu/index.html?shopId=601086122&restaurantViewId=172288&cacheKey=1405742492195807307_601086122_5.43.02&wxAppVersion=5.43.02&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                    path: 'diancan-menu/pages/menu/index.html?newAdvance=false&reserveMode=0&payOpenId=&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=601426200&tableNum=29866410&brandId=&authGeo=undefined'
                 },
                 {
-                    name: '设计之都店',
+                    name: '龙洞店',
                     tags: '新店',
-                    ad: '广州市白云区鹤龙街道白云区黄边北路150号设计之都时光汇1030铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广州市天河区迎龙路1号1160室',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-main/pages/main/index.html?multiShop=1&scanId=1673084916430-56557-9712&reserveMode=0&t=1673084916416&shopId=600795330&uuid=null&payMode=1&entrance=43&fromShopList=1&sign=ef3154265655d2c865371acfe2271f77&tenantId=10215149&qrcodeType=null&paySource=152&newAdvance=true&bizType=1&funcMode=1&autoTakeOrder=1&payOpenId=&accountMode=2&tableNum=&bizMode=1&dishSource=0&orderBizTag=1&scene=0'
+                    path: 'diancan-menu/pages/menu/index.html?shopId=600326998&restaurantViewId=172288&cacheKey=1405742492195807307_600326998_5.54.05&wxAppVersion=5.54.05&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
                 },
                 {
-                    name: '诺德中心店',
+                    name: '花地湾店',
                     tags: '新店',
-                    ad: '广州市番禺区南村镇汉溪大道东477号中铁诺德中心101铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广东省广州市荔湾区东漖北路与浣花路交汇东北',
+                    time: '营业时间：早08:10-晚23:59',
+                    opening: true,
+                    path: 'diancan-menu/pages/menu/index.html?shopId=600450711&restaurantViewId=172288&cacheKey=1405742492195807307_600450711_5.54.05&wxAppVersion=5.54.05&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                },
+                {
+                    name: '星寰广场店',
+                    tags: '',
+                    ad: '越秀区侨光西路11号星寰国际商业广场负一楼（南门旋转楼梯附近）',
+                    time: '营业时间：早08:10-晚23:59',
+                    opening: true,
+                    path: 'diancan-menu/pages/menu/index.html?shopId=601086122&restaurantViewId=172288&cacheKey=1405742492195807307_601086122_5.43.02&wxAppVersion=5.43.02&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                },
+                {
+                    name: '设计之都店',
+                    tags: '',
+                    ad: '广州市白云区鹤龙街道白云区黄边北路150号设计之都时光汇1030铺',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=600543595&tableNum=16226509'
+                    path: 'diancan-main/pages/main/index.html?multiShop=1&scanId=1673084916430-56557-9712&reserveMode=0&t=1673084916416&shopId=600795330&uuid=null&payMode=1&entrance=43&fromShopList=1&sign=ef3154265655d2c865371acfe2271f77&tenantId=10215149&qrcodeType=null&paySource=152&newAdvance=true&bizType=1&funcMode=1&autoTakeOrder=1&payOpenId=&accountMode=2&tableNum=&bizMode=1&dishSource=0&orderBizTag=1&scene=0'
                 },
                 {
                     name: '合生广场店',
-                    tags: '新店',
+                    tags: '',
                     ad: '广州市海珠区叠景路168号170号合生广场101房之九铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?scanId=1661332908472-7456-271&reserveMode=0&t=1661332908457&shopId=600643920&uuid=1rPdk9z3Ccm&payMode=2&entrance=80&sign=cf76d299b0a24bb9d030a6283ba77033&tenantId=10215149&qrcodeType=1&funcMode=1&bizType=0&autoTakeOrder=1&accountMode=2&payOpenId=&tableNum=18216011&dishSource=0&bizMode=1&perceptionPage=true&orderBizTag=0&scene=0'
                 },
                 {
                     name: '天河新天地店',
-                    tags: '新店',
+                    tags: '',
                     ad: '广州市天河区天源路5号天河新天地首层L137号商铺',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=600348263&tableNum=16226229'
                 },
@@ -176,7 +192,7 @@ export default {
                     name: '天河北店',
                     tags: '',
                     ad: '广州市天河区天河北路628号保利中宇广场首层301铺之二',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?scanId=1652758167418-1379-48137&reserveMode=0&t=1652758167398&shopId=600561713&uuid=1okujH21msd&payMode=2&entrance=80&sign=21238d9ffc4af689ac62322171fa521a&tenantId=10215149&qrcodeType=1&funcMode=1&bizType=0&autoTakeOrder=0&accountMode=1&payOpenId=null&tableNum=16226310&dishSource=0&bizMode=1&perceptionPage=true&orderBizTag=0&scene=0'
                 },
@@ -184,7 +200,7 @@ export default {
                     name: '黄埔古港店',
                     tags: '',
                     ad: '广州市海珠区石基路512号古港新地C1079-1080（黄埔古港景观区旁）',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=0&minaId=&spuId=&orderBizTag=0&shopId=600515518&tableNum=15122827'
                 },
@@ -192,7 +208,7 @@ export default {
                     name: '广州荔枝湾店',
                     tags: '',
                     ad: '广州市荔湾区龙津西路94号古玩城D103铺（荔枝湾景区旁）',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?payOpenId=null&minaId=&newAdvance=false&orderBizTag=0&reserveMode=0&restaurantViewId=&tenantId=10215149&tableNum=14489292&paySource=null&spuId=&shopId=600509146&entrance=40'
                 },
@@ -200,18 +216,18 @@ export default {
                     name: '米酷店（万科云城)',
                     tags: '',
                     ad: '广州市天河区万科云城米酷B4栋107、108铺（近天河智慧城地铁B出口）',
-                    time: '营业时间：晚18:00-凌晨02:00',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
                     path: 'diancan-menu/pages/menu/index?newAdvance=false&reserveMode=0&payOpenId=null&entrance=80&tenantId=10215149&restaurantViewId=&paySource=null&minaId=&spuId=&orderBizTag=0&shopId=600343939&tableNum=10732595',
                 },
                 {
-                    name: '万胜围店（琶洲新村)',
+                    name: '黄埔南村店',
                     tags: '',
-                    ad: '广州市海珠区琶洲新村11栋02商铺（近万胜围地铁D出口)',
-                    time: '营业时间：早08:00-凌晨02:00',
+                    ad: '广州市百合三街 6 号 101 铺',
+                    time: '营业时间：早08:10-晚23:59',
                     opening: true,
-                    path: 'diancan-menu/pages/menu/index?scanId=1644378887937-44094-11856&reserveMode=0&t=1644378887934&shopId=600326998&uuid=1dtVjGTyGt8&payMode=1&entrance=80&sign=37403c5500a2712605c4349ce43595a2&tenantId=10215149&qrcodeType=1&funcMode=1&bizType=0&autoTakeOrder=1&accountMode=2&payOpenId=null&tableNum=10488457&dishSource=0&bizMode=1&perceptionPage=true&orderBizTag=0&scene=1401'
-                }
+                    path: 'diancan-menu/pages/menu/index.html?shopId=600576175&restaurantViewId=172288&cacheKey=1405742492195807307_600576175_5.54.05&wxAppVersion=5.54.05&platform=81&tenantId=10215149&appId=wx1fde2c33280d64b6&bizType=4&multiShop=1&orderChannel=91'
+                },
             ],
             tYear: null,
         }

toktok-wx-applet/pages/beerBoxDetail/beerBoxDetail.js

@@ -9,7 +9,8 @@ Page({
   data: {
     popover_Status: true,
     boxId: null,
-    beerBoxDetail: {}
+    beerBoxDetail: {},
+    topViewStatus: true
   },
 
   /**
@@ -28,7 +29,13 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-
+    // 状态栏+导航栏高度
+    let res = wx.getSystemInfoSync()
+    let navBarHeight = res.statusBarHeight + 44
+    console.log(navBarHeight)
+    this.setData({
+      navBarHeight: navBarHeight
+    })
   },
 
   /**
@@ -56,16 +63,26 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    
+  },
+  onPageScroll(e) {
+    // console.log('距顶距离',e.scrollTop)
+    if(e.scrollTop>120) {
+      this.setData({
+        topViewStatus: false
+      })
+    }else{
+      this.setData({
+        topViewStatus: true
+      })
+    }
   },
-
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom() {
 
   },
-
   /**
    * 用户点击右上角分享
    */

toktok-wx-applet/pages/beerBoxDetail/beerBoxDetail.wxml

@@ -1,4 +1,5 @@
 <!--pages/beerBoxDetail/beerBoxDetail.wxml-->
+<view class="top-view" hidden="{{topViewStatus}}" style="height:{{navBarHeight}}px;background: {{beerBoxDetail.bgColor}};"></view>
 <image class="back" src="/static/img/back.png" catchtap="backFun" />
 <image class="beer-bg" src="{{beerBoxDetail.detailBg}}" mode=""/>
 <view class="head-title">

toktok-wx-applet/pages/beerBoxDetail/beerBoxDetail.wxss

@@ -2,9 +2,18 @@
 page{
   display: flex;
   flex-direction: column;
+  position: relative;
+}
+.top-view{
+  position: fixed;
+  top: 0;
+  width: 100vw;
+  height: 200rpx;
+  z-index: 777;
 }
 .back{
   position: fixed;
+  z-index: 888;
   top: 108rpx;
   left: 16rpx;
   width: 48rpx;