no message

.env.dev.js

@@ -1,6 +1,6 @@
 const config = {
-	baseUrl: 'https://test-userapi.sjzkeji.com',
-	socketUrl: 'https://test-userapi.sjzkeji.com',
+	baseUrl: 'http://testfood.jhcs888.com/',
+	socketUrl: 'http://testfood.jhcs888.com/',
     appName:'开发环境'
 }
 module.exports = config;

.env.js

@@ -3,8 +3,8 @@ let ENV_CONFIG = null;
 
 if (nodeEnv === 'development') {
     //开发环境
-    ENV_CONFIG = require('.env.prod.js');
-	// ENV_CONFIG = require('.env.dev.js');
+    // ENV_CONFIG = require('.env.prod.js');
+	ENV_CONFIG = require('.env.dev.js');
 } else {
     //生产环境
     ENV_CONFIG = require('.env.prod.js');

.env.prod.js

@@ -1,6 +1,6 @@
 const config = {
-    baseUrl: 'https://userapi.sjzkeji.com',
-    socketUrl: 'https://userapi.sjzkeji.com',
+    baseUrl: 'http://food.jhcs888.com/',
+    socketUrl: 'http://food.jhcs888.com/',
     appName:'正式环境'
 }
 module.exports = config;

api/goods.js

@@ -1,11 +1,20 @@
 import {request} from '../service/ajax.js'
 
 const newsUrl = '/api/goods/'
-// 获取商品列表
-export const getGoodsList = (data) => request(newsUrl + 'list', 'post', { ...data },false)
+// 获取商家分类
+export const getGoodsCategory = (data) => request(newsUrl + 'category', 'post', { ...data },false)
+// 获取商家商品列表
+export const getGoodsGoods = (data) => request(newsUrl + 'goods', 'post', { ...data },false)
+// 获取商品规格
+export const getGoodsGoodsSpec = (data) => request(newsUrl + 'goodsSpec', 'post', { ...data },false)
 // 搜索商品列表
 export const getSearch = (data) => request(newsUrl + 'search', 'post', { ...data },false)
 // 获取搜索历史内容
 export const getSearchList = (data) => request(newsUrl + 'search_list', 'post', { ...data },false)
 // 删除搜索历史
-export const delSearch = (data) => request(newsUrl + 'del_search', 'post', { ...data },false)
+export const delSearch = (data) => request(newsUrl + 'del_search', 'post', { ...data },false)
+
+////////////////////////////////////////////////////////
+// 获取商品列表
+export const getGoodsList = (data) => request(newsUrl + 'list', 'post', { ...data },false)
+

common/css/common.css

@@ -1,5 +1,5 @@
 body {
-  background-color: #F5F5F5;
+  background-color: #fff;
 }
 
 view,
@@ -561,6 +561,10 @@ text {
   background-color: #EB5127;
 }
 
+.bgc-FF3333 {
+  background-color: #FF3333;
+}
+
 .bgc-FCEDED {
   background-color: #FCEDED;
 }
@@ -664,9 +668,11 @@ text {
 .p-8 {
   padding: 8rpx;
 }
+
 .p-12 {
   padding: 12rpx;
 }
+
 .p-16 {
   padding: 16rpx;
 }
@@ -751,6 +757,14 @@ text {
   padding: 0 24rpx;
 }
 
+.plr-30 {
+  padding: 0 30rpx;
+}
+
+.plr-32 {
+  padding: 0 32rpx;
+}
+
 .p-12-30 {
   padding: 12rpx 30rpx;
 }
@@ -767,12 +781,8 @@ text {
   padding: 40rpx 32rpx 16rpx;
 }
 
-.plr-30 {
-  padding: 0 30rpx;
-}
-
-.plr-32 {
-  padding: 0 32rpx;
+.p-0-32-12 {
+  padding: 0 32rpx 12rpx;
 }
 
 .ptb-15 {
@@ -921,6 +931,10 @@ text {
   margin-right: 50rpx;
 }
 
+.mr-64 {
+  margin-right: 64rpx;
+}
+
 .mb-2 {
   margin-bottom: 2rpx;
 }
@@ -1018,6 +1032,10 @@ text {
   width: 30%;
 }
 
+.w-100100 {
+  width: 100%;
+}
+
 .b-b-F0 {
   border-bottom: 1rpx solid #F0F0F0;
 }
@@ -1026,6 +1044,10 @@ text {
   border-bottom: 1rpx solid #EFF2F5;
 }
 
+.b-b-eee {
+  border-bottom: 1rpx solid #eee;
+}
+
 .b-F5541E {
   border: 1rpx solid #F5541E;
 }

components/en-utils/new-nav/new-nav.vue

@@ -11,7 +11,7 @@
             :style="{width:navTextWidth,lineHeight:customHeight + 'rpx',paddingLeft:textPaddingLeft*scaleFactor+'rpx',fontSize:fontSize*scaleFactor+'rpx',fontWeight:fontWeight,color:titleColor}">
             {{textContent}}
           </view>
-          <view v-else class="">
+          <view v-else :style="{width:navTextWidth}">
           	<slot name="textContent"></slot>
           </view>
           <!-- 返回按钮 -->

manifest.json

@@ -1,119 +1,119 @@
 {
-    "name" : "振合点餐",
-    "appid" : "__UNI__D6BA648",
-    "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "safearea" : {
-            "background" : "#FFFFFF",
-            "bottom" : {
-                "offset" : "auto"
-            }
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {}
-            }
-        }
+  "name": "振合点餐",
+  "appid": "__UNI__D6BA648",
+  "description": "",
+  "versionName": "1.0.1",
+  "versionCode": 101,
+  "transformPx": false,
+  /* 5+App特有相关 */
+  "app-plus": {
+    "usingComponents": true,
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
+    },
+    "safearea": {
+      "background": "#FFFFFF",
+      "bottom": {
+        "offset": "auto"
+      }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx3530a27aa802e153",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "获取您的位置授权，用于更准确的，更快捷的为您服务"
-            }
-        },
-        "safearea" : {
-            "background" : "#FFFFFF",
-            "bottom" : {
-                "offset" : "auto"
-            }
-        },
-        "requiredPrivateInfos" : [ "getLocation" ]
+    /* 模块配置 */
+    "modules": {
+      "Camera": {}
     },
-    "mp-alipay" : {
-        "usingComponents" : true
+    /* 应用发布信息 */
+    "distribute": {
+      /* android打包配置 */
+      "android": {
+        "permissions": [
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      /* ios打包配置 */
+      "ios": {
+        "dSYMs": false
+      },
+      /* SDK配置 */
+      "sdkConfigs": {
+        "ad": {}
+      }
+    }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 */
+  "mp-weixin": {
+    "appid": "wx3530a27aa802e153",
+    "setting": {
+      "urlCheck": false,
+      "minified": true
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    "optimization": {
+      "subPackages": true
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "usingComponents": true,
+    "permission": {
+      "scope.userLocation": {
+        "desc": "获取您的位置授权，用于更准确的，更快捷的为您服务"
+      }
     },
-    "uniStatistics" : {
-        "enable" : false
+    "safearea": {
+      "background": "#FFFFFF",
+      "bottom": {
+        "offset": "auto"
+      }
     },
-    "vueVersion" : "2",
-    "h5" : {
-        "devServer" : {
-            "https" : false,
-            "proxy" : {
-                "/api" : {
-                    // "target" : "https://test-userapi.sjzkeji.com",
-                    "target" : "https://userapi.sjzkeji.com",
-                    "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/api" : "api"
-                    }
-                }
-            }
+    "requiredPrivateInfos": ["getLocation"]
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "vueVersion": "2",
+  "h5": {
+    "devServer": {
+      "https": false,
+      "proxy": {
+        "/api": {
+          "target": "http://testfood.jhcs888.com/",
+          // "target" : "https://userapi.sjzkeji.com",
+          "changeOrigin": true,
+          "secure": false,
+          "pathRewrite": {
+            "^/api": "api"
+          }
         }
-    },
-    "mp-qq" : {
-        "appid" : "1112411948"
+      }
     }
+  },
+  "mp-qq": {
+    "appid": "1112411948"
+  }
 }

pages-takeout/shop.vue

@@ -1,29 +1,23 @@
 <template>
   <view class="shop-index iPhone-bottom flex-common-css box-border-box">
+
     <image class="bg-img" src="@/static/img/order-food/shop-top.png" mode="aspectFill"></image>
-<!--    <Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent' class="z-3 mb-32">
-      <template>
-        <view slot="custom" class="align-items-flex-end">
-          <view class="ss-box b-rad-50 mr-24 align-items-center flex-justify-center">
-            <image class="shop-search" src="@/static/img/order-food/shop-search.png" mode=""></image>
-          </view>
-          <view class="dd-box mr-24">
-            
-          </view>
-        </view>
-      </template>
-    </Nav> -->
+
     <newNav :leftShow="false" :textType='false' class="z-3 mb-32">
-      <view slot="textContent" class="align-items-flex-end">
+      <view slot="textContent" class="align-items-center flex-justify-end">
         <view class="ss-box b-rad-50 mr-24 align-items-center flex-justify-center">
           <image class="shop-search" src="@/static/img/order-food/shop-search.png" mode=""></image>
         </view>
-        <view class="dd-box mr-24">
-          
+        <view class="dd-box align-items-center flex-justify-center b-rad-200 mr-24">
+          <image class="shp-list-img mr-8" src="@/static/img/order-food/shp-list.png" mode=""></image>
+          <view class="fs-28 fc-f">
+            订单
+          </view>
         </view>
       </view>
     </newNav>
-    <view class="bgc-f box-border-box plr-24 mb-32">
+
+    <view class="bgc-f box-border-box plr-32 mb-32">
       <view class="shop-info-box bgc-f box-border-box p-24 z-3 .b-rad-20">
         <view class="fs-40 fw-600 text-overflow-ellipsis mb-16">
           {{shopsInfo.shop_name || "山海鲜熬老灶麻辣火锅辣火锅辣火11 世家匠心传承店川"}}
@@ -33,32 +27,31 @@
         </view>
       </view>
     </view>
-    <!--   <view class="head-box bgc-f box-border-box plr-24">
-      <view id="shopInfoBox" class="shop-info-box bgc-f box-border-box p-24">
-        <view class="top-left-1 fs-40 fw-600 text-overflow-ellipsis">
-          {{shopsInfo.shop_name || "山海鲜熬老灶麻辣火锅辣火锅辣火11 世家匠心传承店川"}}
-        </view>
-        <view class="fs-24 fw-400 fc-9 text-overflow-ellipsis-one">
-          公告：{{shopsInfo.notice||"第二份半价是同时下相同商品的第二份可享受半价受"}}
-        </view>
-      </view>
-    </view> -->
-    <!--    <view class="head-box-1 bgc-f box-border-box plr-24">
+
+    <view class="b-b-eee bgc-f box-border-box p-0-32-12 align-items-center flex-justify-space">
       <view class="align-items-center shop-type-list">
-        <view class="shop-item fs-36" @click="seletShopType(item)" :class="shopType === item.id?'s-item':'n-item'"
-          v-for="(item,i) in shopTypeList" :key="i">
+        <view class="shop-item fs-36 mb-8 mr-64" @click="seletShopType(item)"
+          :class="shopType === item.id?'fc-3 fw-600':'fc-6'" v-for="(item,i) in shopTypeList" :key="i">
           {{item.name}}
         </view>
-        <view class="shop-item-bs" :style="{left:shopTypeBsLeft+'rpx'}"></view>
+        <view class="shop-item-bs bgc-FF3333" :style="{left:shopTypeBsLeft+'rpx'}"></view>
       </view>
-    </view> -->
+      <view class="align-items-center">
+        <image class="zh-icon mr-8" src="@/static/img/order-food/zh-icon.png" mode="aspectFill"></image>
+        <view class="fw-600 fs-32 fc-3">
+          桌号：17
+        </view>
+      </view>
+    </view>
+
     <view class="common-view-css bgc-f" style="overflow: hidden;">
       <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>
+<!--      <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 === 2"></ShopInfo>
     </view>
+    
     <view v-if="shopType === 1" 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>
@@ -468,15 +461,32 @@
 </script>
 
 <style scoped lang="scss">
-  .ss-box{
+  .zh-icon{
+    width: 32rpx;
+    height: 32rpx;
+  }
+  .shp-list-img {
+    width: 40rpx;
+    height: 40rpx;
+  }
+
+  .dd-box {
+    width: 144rpx;
+    padding: 12rpx 0;
+    background: rgba(0, 0, 0, 0.14);
+  }
+
+  .ss-box {
     width: 64rpx;
     height: 64rpx;
-    background: rgba(0,0,0,0.14);
+    background: rgba(0, 0, 0, 0.14);
   }
-  .shop-search{
+
+  .shop-search {
     width: 40rpx;
     height: 40rpx;
   }
+
   .wh-44 {
     width: 44rpx;
     height: 44rpx;
@@ -747,19 +757,12 @@
     z-index: 2;
   }
 
-  .head-box-1 {
-    width: 100%;
-    height: 88rpx;
-    border-bottom: 1rpx solid #eee;
-  }
-
   .shop-type-list {
-    height: 88rpx;
+    // height: 88rpx;
     position: relative;
   }
 
   .shop-item {
-    margin-right: 90rpx;
     position: relative;
   }
 
@@ -777,17 +780,6 @@
     width: 40rpx;
     height: 6rpx;
     border-radius: 20rpx;
-    background-color: #41ABF5;
     transition: left 0.5s;
   }
-
-  .s-item {
-    font-weight: 600;
-    color: #333;
-  }
-
-  .n-item {
-    font-weight: 400;
-    color: #666;
-  }
 </style>