From b29da9b20dda4436627203c054e6ff2226d00feb Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 24 Sep 2021 10:26:36 +0800
Subject: [PATCH] no message

---
 components/popup/index.js      | 3 +++
 components/popup/index.wxml    | 2 +-
 pages/home/index/index.wxml    | 3 +--
 pages/index/index.js           | 1 +
 pages/mall/fragment/index.js   | 4 ++--
 pages/mall/fragment/index.wxml | 4 ++--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/popup/index.js b/components/popup/index.js
index 6e8b6ed..2931547 100644
--- a/components/popup/index.js
+++ b/components/popup/index.js
@@ -132,6 +132,9 @@ baseComponent({
         onExited() {
             this.triggerEvent('closed')
         },
+        stopMove: function(){
+            return true
+        },
         /**
          * 获取过渡的类名
          */
diff --git a/components/popup/index.wxml b/components/popup/index.wxml
index cacb404..5f1be80 100644
--- a/components/popup/index.wxml
+++ b/components/popup/index.wxml
@@ -1,7 +1,7 @@
 <wux-backdrop id="wux-backdrop" wx:if="{{ mask }}" bind:click="onMaskClick" zIndex="{{ zIndex }}" />
 <view class="wux-class {{ classes.wrap }}" style="{{ extStyle }}">
     <wux-animation-group wux-class="{{ prefixCls }}" in="{{ popupVisible }}" classNames="{{ transitionName }}" bind:exited="onExited" wrapStyle="{{ { zIndex } }}" mountOnEnter="{{ mountOnEnter }}" unmountOnExit="{{ unmountOnExit }}">
-        <view class="wux-content-class {{ classes.content }}">
+        <view class="wux-content-class {{ classes.content }}" catch:touchmove="stopMove">
             <view class="wux-header-class {{ classes.hd }}" wx:if="{{ hasHeader }}">
                 <view class="{{ classes.title }}" wx:if="{{ title }}">{{ title }}</view>
                 <block wx:else>
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 386ece0..6a9e40b 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -45,8 +45,7 @@
 			</view>
 		</view>
 		<view class="topButtomVipBJ2" id="tovip" is-link bindtap="toPage">
-			<image class="vipBjImg2" src="/assets/myinfo/vipTopBj.png">
-			</image>
+			<image class="vipBjImg2" src="/assets/myinfo/vipTopBj.png"></image>
 			<text wx:if="{{userInfo.isVIP==1}}" class="vipImgText">立即续费</text>
 			<text wx:else class="vipImgText">开通会员</text>
 		</view>
diff --git a/pages/index/index.js b/pages/index/index.js
index 27dcadd..eac5f80 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -108,6 +108,7 @@ Page({
               app.nowCity = { cityName: app.nowLocation.cityName, cityCode: app.nowLocation.cityCode }
               that.setData({ cityName: app.nowLocation.cityName })
             }
+            event.emit('EventMessage', { what: 444, desc: 'nowCity' })
             that.located = true
           },
           fail: function (res) {
diff --git a/pages/mall/fragment/index.js b/pages/mall/fragment/index.js
index 18f6f12..b12e937 100644
--- a/pages/mall/fragment/index.js
+++ b/pages/mall/fragment/index.js
@@ -5,7 +5,7 @@ const event = require('../../../utils/event')
 const storage = require('../../../utils/storage')
 const util = require('../../../utils/util')
 const app = getApp()
-var form = {sortBy: 1, pageNum: 10, pageSize: 1, categoryId: ''}
+var form = {sortBy: 0, pageNum: 10, pageSize: 1, categoryId: '', cityId: ''}
 var typeList = []
 
 Component({
@@ -72,7 +72,6 @@ Component({
           }
           form.categoryId = typeList[0].categoryId
           this.setData({ tabList })
-          this.fetchAgentList()
         })
       }
       this.initLogin()
@@ -93,6 +92,7 @@ Component({
       if(message.what == 888){
         this.initLogin()
       } else if(message.what == 444){
+        form.cityId = app.nowCity.cityCode
         this.setData({ cityName: app.nowCity.cityName })
         this.fetchAgentList()
       }
diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml
index 1db9bba..1c9e7b1 100644
--- a/pages/mall/fragment/index.wxml
+++ b/pages/mall/fragment/index.wxml
@@ -12,7 +12,7 @@
 				<text class="text-gray text-sm" style="flex: 1;margin-left: 8rpx">输入关键字搜索</text>
 			</view>
 		</view>
-		<view class="flex flex-center" style="margin-left: 24rpx;" id="message" bindtap="gridTap">
+		<view class="flex flex-center" style="margin-left: 24rpx;margin-right: 12rpx;" id="message" bindtap="gridTap">
 			<image style="height: 40rpx;width: 40rpx;" src="/assets/myinfo/messageWhite.png"></image>
 			<wux-badge count="{{messageNumber}}" top="-40" right="4"></wux-badge>
 		</view>
@@ -80,7 +80,7 @@
 	</view>
 	<wux-skeleton active wx:if="{{!orderList.length}}">
 		<view class="flex bg-white" style="padding: 24rpx">
-			<wux-skeleton-paragraph rounded rows="20" wux-class="case3-class" />
+			<wux-skeleton-paragraph rounded rows="10" wux-class="case3-class" />
 		</view>
 	</wux-skeleton>
 	<view wx:for="{{orderList}}" wx:key="index">