1

app.js

@@ -1,7 +1,8 @@
 //app.js
 import commonApi from "./utils/https/common"
 App({
-  onLaunch: function () {
+  onLaunch: function (options) {
+    
     let rect = wx.getSystemInfoSync();
     this.globalData.safeBottom = rect.safeArea?(rect.safeArea.bottom - rect.safeArea.height):0
     // 获取uuid
@@ -40,8 +41,60 @@ App({
         }
       }
     })
+    this.getShareCategoryId()
+  },
+  getShareCategoryId:function(){
+    commonApi._post("share/getShareList",{}).then(res=>{
+      let CategoryIds = {}
+      res.data.map(item=>{
+        CategoryIds[item.mini] = item.id;
+      })
+      this.globalData.CategoryIds = CategoryIds;
+      this.overShare();
+    })
+  },
+  //重写分享方法
+  overShare: function () {
+    //监听路由切换
+    //间接实现全局设置分享内容
+    let that = this;
+    wx.onAppRoute(function (res) {
+        //获取加载的页面
+        let pages = getCurrentPages(),
+            //获取当前页面的对象
+            view = pages[pages.length - 1];
+        if(view &&  view.options && view.options.category_id){
+          that.globalData.category_id = view.options.category_id;
+          commonApi._post("share/share",{
+            id:view.options.category_id,
+            url:view.route
+          }).then(res=>{
+            console.log(res)
+          })
+        }
+        let category_id = that.globalData.CategoryIds[view.route] || null;
+        if(view.route.indexOf('bike/index')!=-1 && !category_id){
+          category_id = that.globalData.CategoryIds[view.route+'?type='+view.options.type]
+        }
+        if (category_id) {
+          view.options = view.options?view.options:{};
+          let str=[];
+          for(let i in view.options){
+            str.push(i+'='+view.options[i])
+          }
+          str = str.join("&");
+          view.onShareAppMessage = function () {
+            //你的分享配置
+            return {
+                path: view.route+'?'+str+'&category_id='+category_id
+            };
+          }
+        }
+    })
 },
   globalData: {
+    CategoryIds:{},//分享出去的页面id
+    category_id:"",//分享进来的参数
     from:"",// 是否是从其他小程序跳转过来的 如果是从其他小程序跳转的话 会记录
     uuid:null,// 设备唯一uuid
     // 苏州市政府的经纬度

app.json

@@ -91,6 +91,8 @@
     "pages/list/message/index",
     "pages/list/minitrip/index",
     "pages/list/oneday/index",
+    "pages/list/daysu/index",
+    "pages/list/daysu/detail/index",
     "pages/pbService/index",
     "pages/pbService/museum/index",
     "pages/pbService/museum/info/index",
@@ -138,7 +140,7 @@
     "pages/group/mine/index",
     "pages/group/info/index",
     "pages/culture/index",
-    "pages/culture/infoindex"
+    "pages/culture/info/index"
   ],
   "permission": {
     "scope.userLocation": {

pages/culture/index.wxml

@@ -29,9 +29,10 @@
     <image src="{{item.cover}}" mode="aspectFill"></image>
     <view class="right-info">
       <view class="textOver2">{{item.name}}</view>
-      <view class="textOver" style="margin:10rpx 0">{{item.begin_date}}-{{item.end_date}}</view>
-      <view class="info-bottom">
-        <view class="info-address">{{item.supplier_name}}</view>
+      <view class="textOver" wx:if="{{item.begin_date || item.end_date}}" style="margin-bottom:5rpx;margin-top:3rpx">{{item.begin_date}}-{{item.end_date}}</view>
+      <view class="textOver" wx:else style="margin-bottom:5rpx;margin-top:3rpx;opacity:0">~  </view>
+      <view class="info-bottom textOver">
+        <view class="info-address textOver">{{item.supplier_name}}</view>
         <!-- <view class="info-btn" style="background:#999999" wx:if="{{item.is_act_end==1}}">已结束</view> -->
         <!-- <view class="info-btn" wx:elif="{{item.is_bind_our_sku==1 && item.is_can_booking==1}}">立即预约</view> -->
         <!-- <view class="info-btn borderbtn" wx:else>无需预约</view> -->

pages/culture/index.wxss

@@ -126,11 +126,14 @@
 .item .textOver2 {
   font-size: 30rpx;
   color: #333;
+  line-height: 42rpx;
+  height: 84rpx;
 }
 .info-bottom {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  width: 100%;
 }
 .info-bottom .info-btn {
   width: 140rpx;
@@ -140,9 +143,11 @@
   line-height: 40rpx;
   text-align: center;
   color: #fff;
+  flex-shrink: 0;
 }
 .right-info {
   flex: 1;
+  width: 400rpx;
 }
 .info-bottom .info-btn.borderbtn {
   background: white;

pages/culture/info/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/info/activityInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
-<title title="活动"></title>
+<title title="活动详情"></title>
 <view wx:if="{{info}}">
   <image src="{{info.cover}}" mode="widthFix" class="swiper"></image>
   <view class="top-box">
@@ -19,8 +19,8 @@
   <rich-text class="box-content" nodes="{{tool.formateRichText(info.intro)}}"></rich-text>
   <!-- <view class="box-tip" wx:if="{{info && info.is_bind_our_sku==0}}">* 本活动无需在线预约，可直接前往。</view> -->
 </view>
-<view style="height:124rpx" wx:if="{{info && info.is_bind_our_sku!=0 && info.sku_id}}"></view>
+<!-- <view style="height:124rpx" wx:if="{{info && info.is_bind_our_sku!=0 && info.sku_id}}"></view>
 <view class="bottom-fixed" wx:if="{{info && info.is_bind_our_sku!=0 && info.sku_id}}"> 
   <view class="bottom-btn" bindtap="order" wx:if="{{info.is_act_end==0}}">预约活动</view>
   <view class="bottom-btn disable" wx:else>活动已过期</view>
-</view>
+</view> -->

pages/culture/infoindex.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/culture/infoindex.wxml

@@ -1,2 +0,0 @@
-<!--pages/culture/infoindex.wxml-->
-<text>pages/culture/infoindex.wxml</text>

pages/culture/infoindex.wxss

@@ -1 +0,0 @@
-/* pages/culture/infoindex.wxss */

pages/info/cardInfo/index.js

@@ -49,6 +49,18 @@ Page({
       id:options.id
     }).then(res=>{
       res.data.display_tags = (res.data.display_tags?res.data.display_tags.split(","):[]).splice(0,2);
+
+
+      // 如果带有指定skuid的话 那么取指定的sku展示
+      if(options.skuid){
+        for(let i = 0;i<res.data.sku.length;i++){
+          if(res.data.sku[i].id==options.skuid){
+            res.data.sku = [res.data.sku[i]];
+            break;
+          }
+        }
+      }
+
       res.data.sku.map(item=>{
         item.sku_model.recharge = item.sku_model.recharge?item.sku_model.recharge.split(","):[];
         item.sku_model.recharge.map(item=>{

pages/info/foodProductInfo/index.js

@@ -33,6 +33,15 @@ Page({
     }).then(res=>{
       let tags = res.data.display_tags?res.data.display_tags.split(","):[];
       res.data.tags = tags.splice(0,2);
+      // 如果带有指定skuid的话 那么取指定的sku展示
+      if(options.skuid){
+        for(let i = 0;i<res.data.sku.length;i++){
+          if(res.data.sku[i].id==options.skuid){
+            res.data.sku = [res.data.sku[i]];
+            break;
+          }
+        }
+      }
       res.data.sku.map(item=>{
         item.display_tags = (item.display_tags?item.display_tags.split(','):[]).splice(0,2)
       })

pages/info/museumInfo/index.js

@@ -42,9 +42,13 @@ Page({
     }).then(res=>{
       // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
       if(res.data.product_venue && res.data.product_venue.sku && res.data.product_venue.sku[0]){
+        let sku = res.data.product_venue.sku[0];
+        if(options.skuid){
+          sku = res.data.product_venue.sku.find(item=>item.id==options.skuid);
+        }
         let product = {
           product:res.data.product_venue,
-          sku:res.data.product_venue.sku[0]
+          sku:sku
         };
         app.globalData.product = product;
         this.setData({

pages/info/postProductInfo/index.js

@@ -41,7 +41,11 @@ Page({
     commonApi._post("product/get_product_detail",{
       id:options.id
     }).then(res=>{
-      res.data.display_tags = (res.data.display_tags?res.data.display_tags.split(","):[]).splice(0,2)
+      res.data.display_tags = (res.data.display_tags?res.data.display_tags.split(","):[]).splice(0,2);
+      if(options.skuid){
+        let sku = res.data.sku.find(item=>item.id==options.skuid);
+        res.data.sku = [sku];
+      }
       this.setData({
         info:res.data
       })

pages/info/roadInfo/index.js

@@ -15,7 +15,8 @@ Page({
     info:null,
     comment:[],
     commentTotal:0,
-    retailId:""
+    retailId:"",
+    retailSkuId:""
   },
 
   /**
@@ -41,6 +42,13 @@ Page({
       id:options.id
     }).then(res=>{
       res.data.display_tags = (res.data.display_tags?res.data.display_tags.split(","):[]).splice(0,2);
+      if(options.skuid){
+        let sku = res.data.sku.find(item=>item.id==options.skuid);
+        res.data.sku = [sku];
+        this.setData({
+          retailSkuId:options.skuid
+        })
+      }
       this.setData({
         info:res.data
       })
@@ -149,7 +157,7 @@ Page({
     }
     app.globalData.retailId = this.data.retailId;
     wx.navigateTo({
-      url: '/pages/order/road/index?id='+this.data.info.id
+      url: '/pages/order/road/index?id='+this.data.info.id+(this.data.retailSkuId?('&skuid='+this.data.retailSkuId):'')
     })
   },
 

pages/info/sceneProductInfo/index.js

@@ -57,6 +57,29 @@ Page({
         return;
       }
       res.data.display_tags = (res.data.display_tags?res.data.display_tags.split(","):[]).splice(0,2);
+      // 如果是带有指定good_id的 那么取指定的
+      if(options.gid){
+        let pItem = res.data.product.find(item=>item.id==options.gid);
+        if(pItem){
+          res.data.product = [pItem];
+        }
+      }
+      // 如果带有指定skuid的话 那么取指定的sku展示
+      if(options.skuid){
+        let pItem = null;
+        for(let i = 0;i<res.data.product.length;i++){
+          for(let j=0;j<res.data.product[i].sku.length;j++){
+            if(res.data.product[i].sku[j].id==options.skuid){
+              res.data.product[i].sku = [res.data.product[i].sku[j]];
+              pItem = res.data.product[i];
+              break;
+            }
+          }
+        }
+        if(pItem){
+          res.data.product = [pItem];
+        }
+      }
       // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
       res.data.product.map(product=>{
         product.sku.map(sku=>{
@@ -217,6 +240,5 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-
   }
 })

pages/list/activitynew/index.js

@@ -47,6 +47,12 @@ Page({
         area_code:"",
         area_name:"苏州市"
       })
+      if(options.area_code){
+        let index = res.data.findIndex(item=>item.area_code==options.area_code);
+        this.setData({
+          area:index
+        })
+      }
       this.setData({
         areas:res.data
       })

pages/culture/infoindex.js → pages/list/daysu/detail/index.js

@@ -1,4 +1,4 @@
-// pages/culture/infoindex.js
+// pages/list/daysu/detail/index.js
 Page({
 
   /**

pages/list/daysu/detail/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}

pages/list/daysu/detail/index.wxml

@@ -0,0 +1,2 @@
+<title title="天工苏作"></title>
+<image style="display:block;width:100%" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/other/daysudetail.jpg" mode="widthFix"></image>

pages/list/daysu/detail/index.wxss

@@ -0,0 +1 @@
+/* pages/list/daysu/detail/index.wxss */

pages/list/daysu/index.js

@@ -0,0 +1,76 @@
+// pages/list/daysu/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    showVideo:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+  play:function(){
+    this.setData({
+      showVideo:true
+    })
+  },
+  videoend:function(){
+    this.setData({
+      showVideo:false
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/list/daysu/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}

pages/list/daysu/index.wxml

@@ -0,0 +1,20 @@
+<!--pages/list/daysu/index.wxml-->
+<title title="天工苏作"></title>
+<view style="position:relative">
+  <image style="display:block;width:100%" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/other/DaySu.jpg" mode="widthFix"></image>
+  <navigator url="detail/index" class="intro-box"></navigator>
+  <view class="video-box" wx:if="{{showVideo}}">
+    <video 
+    style="width:100%;height:100%;display:block"
+      id="myVideo" 
+      src="https://static.ticket.sz-trip.com/uploads/20210710/1018ce118c0351bff686146d32bf40b5.mp4" 
+      show-center-play-btn='{{false}}' 
+      show-play-btn="{{true}}" 
+      autoplay
+      controls="{{true}}"
+      bindended="videoend"
+    ></video>
+  </view>
+  <view class="video-box" bindtap="play" wx:else></view>
+  <navigator url="../feiyi/index" class="more-btn"></navigator>
+</view>

pages/list/daysu/index.wxss

@@ -0,0 +1,22 @@
+/* pages/list/daysu/index.wxss */
+.intro-box {
+  position: absolute;
+  right: 0;
+  top: 42rpx;
+  width: 139rpx;
+  height: 67rpx;
+}
+.video-box {
+  position: absolute;
+  width: 697rpx;
+  height: 392rpx;
+  left: 27rpx;
+  top: 1297rpx;
+}
+.more-btn {
+  top: 1790rpx;
+  position: absolute;
+  right: 26rpx;
+  left: 507rpx;
+  height: 30rpx;
+}

pages/list/hotel/index.js

@@ -10,13 +10,19 @@ Page({
     type:5,
     total:1,
     list:[],
-    keywords:""
+    keywords:"",
+    area_id:null
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if(options.area_id){
+      this.setData({
+        area_id:options.area_id
+      })
+    }
     this.getList()
   },
   search:function(e){
@@ -39,7 +45,8 @@ Page({
       limit:10,
       sort:"weight",
       tag_id:this.data.type,
-      title:this.data.keywords
+      title:this.data.keywords,
+      area_id:this.data.area_id
     }).then(res=>{
       res.data.list.map(item=>{
         console.log(item.third_supplier_type)

pages/list/movieticket/index.js

@@ -26,6 +26,12 @@ Page({
         area_id:"",
         area_title:"苏州"
       })
+      if(options.area_id){
+        let index = res.data.findIndex(item=>item.area_id==options.area_id);
+        this.setData({
+          areaIndex:index==-1?0:index
+        })
+      }
       this.setData({
         areas:res.data
       })

pages/list/scene/index.js

@@ -12,7 +12,8 @@ Page({
     total:1,
     latitude:"",
     longitude:"",
-    keywords:''
+    keywords:'',
+    area_id:''
   },
 
   /**
@@ -20,6 +21,11 @@ Page({
    */
   onLoad: function (options) {
     let that = this;
+    if(options.area_id){
+      this.setData({
+        area_id:options.area_id
+      })
+    }
     wx.getLocation({
       type: 'gcj02',
       success: function (res) {
@@ -57,7 +63,8 @@ Page({
       lat:this.data.latitude,
       offset:list.length,
       sort:"weight",
-      title:this.data.keywords
+      title:this.data.keywords,
+      area_id:this.data.area_id
     }).then(res=>{
       res.data.list.map(item=>{
         item.tags = item.tags?item.tags.split(","):[];

pages/list/six/index.wxml

@@ -9,19 +9,59 @@
       <view class="iconfont icon-xia"></view>
     </view>
   </picker>
-  <picker mode="selector" range="{{types}}" range-key="type_name" bindchange="changeType">
+  <!-- <picker mode="selector" range="{{types}}" range-key="type_name" bindchange="changeType">
     <view class="picker active">
       <view class="areatext">{{types[typeIndex].type_name}}</view>
       <view class="iconfont icon-xia"></view>
     </view>
-  </picker>
+  </picker> -->
+</view>
+<view class="new-title">文旅服务</view>
+<view class="new-icons">
+  <navigator url="../activitynew/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
+    <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon1.png" mode="widthFix"></image>
+    <view>活动日历</view>
+  </navigator>
+  <navigator url="../scene/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
+    <image class="green-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon2.png" mode="widthFix"></image>
+    <view>景点门票</view>
+  </navigator>
+  <navigator url="../hotel/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
+    <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon3.png" mode="widthFix"></image>
+    <view>酒店住宿</view>
+  </navigator>
+  <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
+    <image class="purple-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon4.png" mode="widthFix"></image>
+    <view>电影购票</view>
+  </navigator>
+</view>
+<view class="new-title">公共服务</view>
+<view class="new-icons">
+  <navigator url="/pages/pbService/sceneComfort/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
+    <image class="green-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon5.png" mode="widthFix"></image>
+    <view>景区舒适度</view>
+  </navigator>
+  <navigator url="/pages/pbService/bike/index?type=2&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
+    <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon6.png" mode="widthFix"></image>
+    <view>停车场</view>
+  </navigator>
+  <navigator url="/pages/pbService/bike/index?type=0&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
+    <image class="red-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon7.png" mode="widthFix"></image>
+    <view>公共自行车</view>
+  </navigator>
+  <navigator url="/pages/pbService/wwcx/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
+    <image class="yellow-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon8.png" mode="widthFix"></image>
+    <view>文物查询</view>
+  </navigator>
 </view>
+<view class="new-title">周边推荐</view>
 <view class="list">
   <view class="item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
     <image src="{{item.headimg}}" class="main-img" mode="aspectFill"></image>
     <view class="textOver2 title">{{item.title}}</view>
     <view class="location textOver"><text class="iconfont icon-location"></text>{{item.address}}</view>
-    <view class="price"><text class="unit">￥</text><text class="number">{{item.price/100}}</text><text>起</text></view>
+    <view class="price" wx:if="{{item.price}}"><text class="unit">￥</text><text class="number">{{item.price/100}}</text><text>起</text></view>
+    <view class="price" wx:else><text class="number">免费</text></view>
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:300rpx">

pages/list/six/index.wxss

@@ -14,7 +14,10 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin: 30rpx 48rpx;
+  position: absolute;
+  left: 50rpx;
+  margin-top: -80rpx;
+  color: #fff;
 }
 .types-box .picker {
   display: flex;
@@ -23,6 +26,7 @@
   height: 54rpx;
   border: 1rpx solid #ccc;
   border-radius: 4rpx;
+  border-radius: 27rpx;
 }
 .types-box .picker .iconfont {
   width: 60rpx;
@@ -81,3 +85,46 @@
   font-size: 33rpx;
   font-weight: 500;
 }
+.new-title {
+  margin: 0 25rpx;
+  margin-top: 50rpx;
+  font-size: 33rpx;
+  font-weight: bold;
+  margin-bottom: 40rpx;
+}
+.new-icons {
+  display: flex;
+  justify-content: space-between;
+  text-align: center;
+  margin: 0 25rpx;
+  font-size: 27rpx;
+}
+.new-icons image {
+  display: block;
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  background: white;
+  box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(227, 127, 61, 0.24);
+  margin: 0 auto;
+  margin-bottom: 20rpx;
+}
+.new-icon {
+  width: 131rpx;
+  margin-bottom: 20rpx;
+}
+.new-icon image.green-shadow {
+  box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(41, 176, 100, 0.24);
+}
+.new-icon image.purple-shadow {
+  box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(128, 76, 220, 0.24);
+}
+.new-icon image.blue-shadow {
+  box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(57, 92, 219, 0.24);
+}
+.new-icon image.red-shadow {
+  box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(234, 92, 92, 0.24);
+}
+.new-icon image.yellow-shadow {
+  box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(194, 123, 20, 0.24);
+}

pages/list/store/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/feiyi/list/index.wxml-->
 <!-- 非遗列表页面 -->
 <!-- <wxs src="../../../../utils/filter.wxs" module="tool" /> -->
-<title wx:if="{{info}}" title="{{info.supplier_name}}"></title>
+<title wx:if="{{info}}" title="{{info.shop_name}}"></title>
 <common-image wx:if="{{info}}" class="heaimg" src="{{info.banner_img}}" mode="widthFix"></common-image>
 <!-- <swiper class="swiper" wx:if="{{info.listImgs.length>0}}" indicator-dots="true" indicator-color="rgba(255,255,255,0.5)" indicator-active-color="white" autoplay="true" interval="5000" duration="500">
 	<block wx:for="{{info.listImgs}}" wx:key="*this">

pages/list/techan/index.wxml

@@ -13,7 +13,7 @@
     <view class="top-info">
       <common-image mode="aspectFill" src="{{item.headimg}}"></common-image>
       <view class="supplier-info">
-        <view class="supplier-name textOver">{{item.supplier_name}}</view>
+        <view class="supplier-name textOver">{{item.shop_name}}</view>
         <view class="supplier-tags">
           <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
         </view>

pages/order/card/index.js

@@ -187,6 +187,9 @@ Page({
     if(app.globalData.from){
       data.system_name = app.globalData.from;
     }
+    if(app.globalData.category_id){
+      data.category_id = app.globalData.category_id;
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{

pages/order/food/index.js

@@ -117,6 +117,9 @@ Page({
       data.commission_code = app.globalData.retailId;
       app.globalData.retailId = null;
     }
+    if(app.globalData.category_id){
+      data.category_id = app.globalData.category_id;
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{

pages/order/hotel/index.js

@@ -322,6 +322,9 @@ Page({
         data.commission_code = app.globalData.retailId;
         app.globalData.retailId = null;
       }
+      if(app.globalData.category_id){
+        data.category_id = app.globalData.category_id;
+      }
       commonApi.user_post("order/create",{
         data:JSON.stringify(data)
       }).then(res=>{

pages/order/movie/index.js

@@ -96,6 +96,9 @@ Page({
       data.commission_code = app.globalData.retailId;
       app.globalData.retailId = null;
     }
+    if(app.globalData.category_id){
+      data.category_id = app.globalData.category_id;
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{

pages/order/postOrder/index.js

@@ -140,6 +140,9 @@ Page({
       data.commission_code = app.globalData.retailId;
       app.globalData.retailId = null;
     }
+    if(app.globalData.category_id){
+      data.category_id = app.globalData.category_id;
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{

pages/order/road/index.js

@@ -34,6 +34,10 @@ Page({
       id:this.data.id
     }).then(res=>{
       let nums = [];
+      if(options.skuid){
+        let sku = res.data.sku.find(item=>item.id==options.skuid);
+        res.data.sku = [sku];
+      }
       res.data.sku.map(item=>{
         nums.push(0)
       })

pages/order/roadOrder/index.js

@@ -253,6 +253,9 @@ Page({
       data.commission_code = app.globalData.retailId;
       app.globalData.retailId = null;
     }
+    if(app.globalData.category_id){
+      data.category_id = app.globalData.category_id;
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{

pages/order/scene/index.js

@@ -183,6 +183,9 @@ Page({
       data.commission_code = app.globalData.retailId;
       app.globalData.retailId = null;
     }
+    if(app.globalData.category_id){
+      data.category_id = app.globalData.category_id;
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{

pages/order/showOrder/index.js

@@ -61,6 +61,9 @@ Page({
       data.commission_code = app.globalData.retailId;
       app.globalData.retailId = null;
     }
+    if(app.globalData.category_id){
+      data.category_id = app.globalData.category_id;
+    }
     commonApi.user_post("order/create",{
       data:JSON.stringify(data)
     }).then(res=>{

pages/pbService/bike/index.js

@@ -36,22 +36,22 @@ Page({
       success: function (res) {
         console.log(res)
         that.setData({
-          latitude:res.latitude,
-          longitude:res.longitude,
+          latitude:options.lat?options.lat:res.latitude,
+          longitude:options.lon?options.lon:res.longitude,
           location:{
-            latitude:res.latitude,
-            longitude:res.longitude
+            latitude:options.lat?options.lat:res.latitude,
+            longitude:options.lon?options.lon:res.longitude
           }
         })
         that.getList()
       },
       fail:function(err){
         that.setData({
-          latitude:app.globalData.latitude,
-          longitude:app.globalData.longitude,
+          latitude:options.lon?options.lon:app.globalData.latitude,
+          longitude:options.lon?options.lon:app.globalData.longitude,
           location:{
-            latitude:app.globalData.latitude,
-            longitude:app.globalData.longitude
+            latitude:options.lat?options.lat:app.globalData.latitude,
+            longitude:options.lon?options.lon:app.globalData.longitude
           }
         })
         that.getList()

pages/pbService/index.wxml

@@ -81,6 +81,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
       <view>垃圾分类</view>
     </view>
+    <view class="pb-item" data-title="博物馆查询" bindtap="gotoPath" data-path="/pages/culture/index">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
+      <view>文化配送</view>
+    </view>
     <view class="pb-item" data-title="博物馆查询" bindtap="gotoPath" data-path="/pages/pbService/museum/index">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb19.png" mode="widthFix"></image>
       <view>博物馆查询</view>

pages/pbService/sceneComfort/index.js

@@ -52,10 +52,17 @@ Page({
       res.data.unshift({
         area_name:"不选择"
       })
+      if(options.area_code){
+        let index = res.data.findIndex(item=>item.area_code==options.area_code);
+        this.setData({
+          areaIndex:index==-1?0:index
+        })
+      }
       this.setData({
         areas:res.data,
         areaObj:areaObj
       })
+      this.getList();
     })
     commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
       console.log(res)
@@ -71,7 +78,7 @@ Page({
         sceneLevelObj:sceneLevelObj
       })
     })
-    this.getList();
+    
   },
   changeArea:function(e){
     this.setData({

pages/pbService/sceneComfort/index.wxss

@@ -110,6 +110,7 @@ page {
   display: flex;
   align-items: center;
   margin-top: 10rpx;
+  white-space: nowrap;
 }
 .comfort-level {
   padding: 0 16rpx;

pages/pbService/wwcx/index.js

@@ -48,12 +48,19 @@ Page({
         area_code:null,
         area_name:'全部'
       })
+      if(options.area_code){
+        let areaIndex = res.data.findIndex(item=>item.area_code==options.area_code);
+        this.setData({
+          areaIndex:areaIndex
+        })
+      }
       this.setData({
         areas:res.data,
         areaName:areaName
       })
-    })
       this.getList()
+    })
+    
   },
   // 修改是否可移动
   changeType:function(e){

pages/user/bindtel/index.js

@@ -157,6 +157,9 @@ Page({
       service = "user/wxBindPhoneAndLogin"
       data.openid = this.data.regToken
       data.fromSource = "WECHATXCX"
+      if(app.globalData.category_id){
+        data.category_id = app.globalData.category_id;
+      }
       api = user._post
     }
     api(service,data).then(res=>{

pages/user/retail/apply/index.js

@@ -38,6 +38,34 @@ Page({
     })
   },
   apply:function(){
+    if(this.data.index<0){
+      wx.showToast({
+        title: '请选择所属单位',
+        icon:'none'
+      })
+      return;
+    }
+    if(!this.data.name){
+      wx.showToast({
+        title: '请输入姓名',
+        icon:'none'
+      })
+      return;
+    }
+    if(this.data.phone.length!=11){
+      wx.showToast({
+        title: '请输入正确的手机号',
+        icon:'none'
+      })
+      return;
+    }
+    if(this.data.id_card.length!=18){
+      wx.showToast({
+        title: '请输入正确的身份证号',
+        icon:'none'
+      })
+      return;
+    }
     spreadApi.user_post("commission/Register",{
       user_name:this.data.name,
       mobile:this.data.phone,

pages/user/retail/goods/index.js

@@ -154,7 +154,7 @@ Page({
       let item = e.target.dataset.item;
       return {
         title: item.product.title,
-        path: this.getUrl(item.product)+'&retailId='+this.data.commission_code,  //分享页面地址
+        path: this.getUrl(item.product)+'&retailId='+this.data.commission_code+'&skuid='+item.sku_id+'&gid='+item.goods_id,  //分享页面地址
         imageUrl:item.product.headimg
       }
     }

pages/user/retail/goods/index.wxml

@@ -3,9 +3,9 @@
 <view class="item" wx:for="{{list}}">
   <image src="{{item.product.headimg}}" mode="aspectFill"></image>
   <view class="item-center">
-    <view class="item-title">{{item.product.title}}</view>
-    <view class="item-price">￥{{item.product.price/100}}<text>起</text></view>
-    <view class="item-money">佣金：预计{{item.commission_price/100}}元</view>
+    <view class="item-title">{{item.product.title+item.sku.sku_name}}</view>
+    <view class="item-price">￥{{item.sku.price/100}}<text>起</text></view>
+    <view class="item-money">佣金：预计{{item.expect_price}}元</view>
   </view>
   <button open-type="share" class="item-btn" data-item="{{item}}">分享</button>
 </view>

pages/user/retail/goods/index.wxss

@@ -33,11 +33,6 @@ button.item-btn {
   color: #fff;
   padding: 0 !important;
 }
-.item-title {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
 .item-price {
   color: #D62828;
   margin-top: 10rpx;

pages/user/user.wxml

@@ -54,9 +54,9 @@
     <navigator url="likes/index" class="user-box-line">
     我的收藏
     </navigator>
-    <view bindtap="retail" class="user-box-line">
+    <!-- <view bindtap="retail" class="user-box-line">
     我要分销
-    </view>
+    </view> -->
     <navigator url="verify/index" class="user-box-line" wx:if="{{info && info.name_verification=='UNCERTFIED'}}">
     实名认证
     </navigator>

project.private.config.json

@@ -13,9 +13,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/user/user",
-          "pathName": "pages/user/user",
-          "query": "user_id=25&id=68&originate_id=109",
+          "name": "pages/list/six/index",
+          "pathName": "pages/list/six/index",
+          "query": "id=5442&retailId=17020017459&skuid=1209&gid=3841",
           "scene": null
         },
         {
@@ -25,8 +25,8 @@
           "scene": null
         },
         {
-          "name": "pages/group/index",
-          "pathName": "pages/group/index",
+          "name": "pages/list/daysu/index",
+          "pathName": "pages/list/daysu/index",
           "query": "id=0000000000LINELINEINFO18082257199008",
           "scene": null
         },
@@ -51,7 +51,7 @@
         {
           "name": "PRPark",
           "pathName": "pages/pbService/PRpark/index",
-          "query": "type=2",
+          "query": "category_id=27",
           "scene": null
         },
         {

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/";
-// const baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+const baseUrl = "https://api.cloud.sz-trip.com/api/";
 const orders = ['','weight','distance','sale_number','sale_price','price'];
 //封装GET请求
 function _get(url,data) {