1

app.js

@@ -42,6 +42,7 @@ App({
     })
   },
   globalData: {
+    from:"",// 是否是从其他小程序跳转过来的 如果是从其他小程序跳转的话 会记录
     uuid:null,// 设备唯一uuid
     // 苏州市政府的经纬度
     latitude:"31.297401",//纬度

pages/index/index.js

@@ -24,7 +24,10 @@ Page({
     listMore:true,
     isTest:false
   },
-  onLoad: function () {
+  onLoad: function (options) {
+    if(options.from){
+      app.globalData.from = options.from;
+    }
     let systemInfo = wx.getSystemInfoSync(),rect = wx.getMenuButtonBoundingClientRect();
     let height = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
     this.getList()
@@ -186,7 +189,7 @@ Page({
   audioGuide:function(){
     wx.navigateToMiniProgram({
       appId: 'wx74f380bc721a0379',
-      path:'/pages/listen/listen'
+      path:'/pages/listen/listen?title=君到苏州'
     })
   },
   // 热门推荐

pages/info/sceneProductInfo/index.js

@@ -141,7 +141,7 @@ Page({
   audioGuide:function(){
     wx.navigateToMiniProgram({
       appId: 'wx74f380bc721a0379',
-      path:'/pages/listen/listen'
+      path:'/pages/listen/listen?title=君到苏州'
     })
   },
   showBookingInfo:function(e){

pages/map/index.js

@@ -203,6 +203,12 @@ Page({
         lon:this.data.longitude,
         lat:this.data.latitude
       },service="product/get_product_by_type";
+      if(!menu){
+        this.setData({
+          productTotal:0
+        })
+        return;
+      }
       switch(menu){
         case "购票":
           break;
@@ -378,6 +384,8 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
+  },
+  preventTouchMove:function(){
 
   },
 

pages/map/index.wxml

@@ -99,8 +99,11 @@
         </view>
       </view>
     </view>
+    <view bindtap="getProductList" wx:if="{{productList.length<productTotal}}" style="text-align:center;line-height:50rpx;font-size:26rpx;color:#666">
+      查看更多
+    </view>
   </view>
 </view>
-<view class="mask" wx:if="{{showAllMask}}" bindtap="closeMask">
+<view class="mask" wx:if="{{showAllMask}}" bindtap="closeMask" catchtouchmove="preventTouchMove">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
 </view>

pages/map/index.wxss

@@ -193,7 +193,6 @@
   margin-top: 20rpx;
   display: flex;
   align-items: center;
-  justify-content: space-between;
   height: 84rpx;
   line-height: 84rpx;
   border-bottom: 1rpx solid #ccc;

pages/order/coupon/index.wxml

@@ -1,11 +1,17 @@
 <!--pages/order/coupon/index.wxml-->
 <title title="优惠券"></title>
-<view class="coupon-item" wx:for="{{list}}">
+<view wx:if="{{list.length>0}}">
+  <view class="coupon-item" wx:for="{{list}}">
     <view class="money">{{item.activity.money/100}}</view>
     <view class="coupon-info">
       <view>满{{item.activity.mini_money/100}}元可用</view>
       <view class="couon-date">{{item.activity.end_time}}到期</view>
     </view>
     <view class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
+  </view>
+  <view class="btn" bindtap="submit">确定</view>
+</view>
+<view class="common-empty" wx:if="{{list.length==0}}" style="z-index:-1;top:0">
+  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+  <view>暂无优惠券</view>
 </view>
-<view class="btn" bindtap="submit">确定</view>

pages/pbService/appreciate/index.js

@@ -44,7 +44,7 @@ Page({
     // 获取图片的标签
     commonApi._post("pbservice/Artpopulate/imgTags").then(res=>{
       res.data.unshift({
-        Name:"全部",
+        Name:"全城",
         TagId:null
       })
       this.setData({
@@ -103,9 +103,14 @@ Page({
   gotoDetail:function(e){
     let info = e.currentTarget.dataset.info;
     if(this.data.type==2) {
+      commonApi.user_post("pbservice/Other/autoupload",{
+        url:info.Pic
+      }).then(res=>{
+        console.log(res)
         wx.previewImage({
-        urls: [info.Pic],
+          urls: [res.data.url],
-        current:info.Pic
+          current:res.data.url
+        })
       })
       return;
     }

utils/https.js

@@ -146,7 +146,7 @@ function user_post(url,data={}){
           }
           else if (res.data.code != 1 && res.data.msg) {
             wx.showToast({
-              title: res.data.msg,
+              title: res.data.msg==='身份证号码错误'?'身份证和姓名不匹配':res.data.msg,
               icon: "none",
               duration:2000
             })