美食

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest136? true : false;
+            data.isTest = data.isTest137? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/info/foodNew/index.wxml

@@ -112,7 +112,6 @@
 </view>
 
 <view class="scroll-all-box"  wx:if="{{info}}">
-    <view style="height:85rpx" wx:if="{{fixed}}"></view>
     <view class="info-box" id="box1">
         <view class="info-title">套餐详情</view>
         <rich-text class="details" nodes="{{tool.formateRichText(info.content)}}"></rich-text>

pages/list/foodNew/index.js

@@ -12,8 +12,8 @@ Page({
     tagList: [
         {id: 9, name: "品苏式面"},
         {id: 10, name: "尝农家乐"},
-        {id: 11, name: "鉴苏帮菜"},
-        {id: 12, name: "寻夜食堂"},
+        // {id: 11, name: "鉴苏帮菜"},
+        // {id: 12, name: "寻夜食堂"},
     ], // 父标签477
     total:1,
     type:9,
@@ -88,7 +88,7 @@ Page({
     let list = this.data.list,that = this;
     if(list.length>=this.data.total) return;0
     // // 距离排序
-    if(this.data.needDistance && !this.data.lon){
+     if(this.data.needDistance && !this.data.lon){
       wx.getLocation({
         type: 'gcj02',
         success: function (res) {
@@ -111,13 +111,17 @@ Page({
   realgetList:function(){
     let list = this.data.list;
 
+    let param = {}
+    if (this.data.needDistance) {
+        param = {lat:this.data.lat,lon:this.data.lon}
+    }
+
     commonApi._post("supplier/get_supplier_list",{
       supplier_tag_id: this.data.type,
       area_id: (this.data.areas[this.data.areaIndex] || {id: 0}).id,
       offset:list.length,
       limit:10,
-    //   lat:this.data.lat,
-    //   lon:this.data.lon,
+        ...param,
     keyword:this.data.keywords
     }).then(res=>{
       this.setData({

pages/list/foodNew/index.wxml

@@ -11,12 +11,12 @@
         <view>
             <picker mode="selector" value="{{areaIndex}}" range="{{areas}}" range-key="name" bindchange="changeArea">
                 <view class="picker feiyi-picker">
-                    <text>{{areaIndex>0?areas[areaIndex].name:'选择地区'}}</text>
+                    <text style="color: {{areaIndex>0?'#FF8530':'#000000'}};">{{areaIndex>0?areas[areaIndex].name:'选择地区'}}</text>
                     <view class="trian-down"></view>
                 </view>
             </picker>
         </view>
-        <view bind:tap="selectDistance">距离最近</view>
+        <view bind:tap="selectDistance" style="color: {{needDistance?'#FF8530':'#000000'}};">距离最近</view>
     </view>
 
 </view>
@@ -29,13 +29,17 @@
   <image lazy-load src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="info">
     <view class="textOver2 title">{{item.supplier_name}}</view>
-    <view class="textOver subtitle">{{item.address}}</view>
+    <view class=" subtitle" style="display: flex;">
+        <text class="textOver" style="flex: 1;width: 100rpx;padding-right: 40rpx;">{{item.address}}</text>
+
+        <text style="flex-shrink: 0;" wx:if="{{item.distance>0}}">{{item.distance}}km</text>
+    </view>
     <view class="line" wx:if="{{item.hot_products.length>0}}"></view>
     <view class="prod-container" wx:for="{{item.hot_products}}" wx:for-item="prod" wx:for-index="indexs" wx:key="indexs">
       <view class="prod-item textOver">
             <text class="hot">热</text>
             <text class="price">￥{{prod.price?prod.price/100:0}}</text>
-            <text class="prod-name">{{prod.title}}</text>
+            <text class="prod-name textOver">{{prod.title}}</text>
       </view>
     </view>
   </view>

pages/list/foodNew/index.wxss

@@ -26,7 +26,7 @@ page{
     display: flex;
     align-items: flex-end;
     padding: 0 26rpx 50rpx;
-    justify-content: space-between;
+    /* justify-content: space-between; */
     box-sizing: border-box;
 }
 .sale-type {
@@ -40,6 +40,7 @@ page{
     background-size: 100% 100%;
     text-align: center;
     line-height: 77rpx;
+    margin-right: 40rpx;
 }
 .sale-type.active {
     font-weight: bold;
@@ -144,6 +145,7 @@ page{
     text-align: center;
     line-height: 31rpx;
     margin-right: 17rpx;
+    flex-shrink: 0;
 }
 .prod-item .price{
     font-weight: bold;

pages/order/food/index.js

@@ -35,6 +35,7 @@ Page({
       })
     })
     console.log(app.globalData.product)
+    this.showAllPrice()
   },
   showNotice:function(){
     this.setData({
@@ -95,11 +96,14 @@ Page({
       productNum:(this.data.productNum-1),
       coupon:null
     })
+    this.showAllPrice()
   },
   add:function(){
     this.setData({
       productNum:this.data.productNum+1
     })
+    this.showAllPrice()
+
   },
   userInput:function(e){
     this.setData({

pages/search/list/index.wxss

@@ -50,6 +50,7 @@ page {
   font-size: 29rpx;
   color: #333;
   overflow-x: auto;
+  overflow-y: hidden;
 }
 .search-type {
   flex-shrink: 0;
@@ -160,6 +161,7 @@ page {
   font-size: 20rpx;
   line-height: 20rpx;
   align-items: center;
+  overflow: visible;
 }
 .scene-tag {
   position: relative;

utils/https.js

@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"