From 33f6cc099212c57465eac3a685ad0adae4e34010 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Sat, 11 Apr 2020 17:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                            | 9 +--------
 components/refresher/index.js     | 4 ++++
 pages/mall/order-info/index.json  | 1 +
 pages/mall/order-info/index.wxml  | 2 +-
 pages/mall/search-list/index.js   | 7 ++++++-
 pages/mall/search-list/index.wxml | 2 +-
 pages/mall/shops/index.js         | 7 ++++++-
 pages/mall/shops/index.wxml       | 2 +-
 8 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app.js b/app.js
index b6140ad..1ff227d 100644
--- a/app.js
+++ b/app.js
@@ -11,17 +11,10 @@ App({
   },
 
   onLaunch: function () {
-    // 获取全局尺寸的一些配置
-    // var sysInfo = wx.getAccountInfoSync()
-    // if (sysInfo.miniProgram.appId == 'wx9e774103645f5c54') {
-    //   this.httpUrl = 'http://192.168.0.106:9000'
-    // } else if (sysInfo.miniProgram.appId == 'wx5371934de00d6215') {
-    //   this.httpUrl = 'https://mini.qniao.cn'
-    // }
     if (this.release) {
       this.httpUrl = 'https://api.qniao.cn'
     } else {
-      this.httpUrl = 'http://192.168.0.24:9000'
+      this.httpUrl = 'https://api-test.qniao.cn'
     }
     wx.getSystemInfo({
       success: e => {
diff --git a/components/refresher/index.js b/components/refresher/index.js
index 61463a6..a918f48 100644
--- a/components/refresher/index.js
+++ b/components/refresher/index.js
@@ -27,6 +27,10 @@ let options = janComponent({
       type: String,
       value: "inherit"
     },
+    scrollTop: {
+      type: Number,
+      value: true
+    },
     triggered: {
       type: Boolean,
       value: false
diff --git a/pages/mall/order-info/index.json b/pages/mall/order-info/index.json
index 8162bd9..23a2ca7 100644
--- a/pages/mall/order-info/index.json
+++ b/pages/mall/order-info/index.json
@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "wux-button": "/components/button/index",
+    "wux-icon": "/components/icon/index",
     "wux-input-number": "/components/input-number/index"
 }
 }
\ No newline at end of file
diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml
index 2c82615..e8c7e4e 100644
--- a/pages/mall/order-info/index.wxml
+++ b/pages/mall/order-info/index.wxml
@@ -18,7 +18,7 @@
 		<view class="flex flex-center">
 			<view class="text-gray" style="font-size:12px;margin-right:24rpx">{{orderInfo.viewNum}}  浏览</view>
 			<button open-type="share" style="background-color: #fff;border-radius: 0;padding-left: 0px;padding-right: 0px;">
-				<image style="width:24rpx;height:24rpx" src="/assets/image/icon_share.png"></image>
+				<wux-icon type="md-share" color="#333333" size="16" />
 			</button>
 		</view>
 	</view>
diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js
index 7684b0e..83dcac1 100644
--- a/pages/mall/search-list/index.js
+++ b/pages/mall/search-list/index.js
@@ -16,6 +16,7 @@ Page({
     loading: false,
     finished: false,
     requesting: false,
+    top: 0,
     rearchStringList: [],
     taskList: [],
     form: {
@@ -113,7 +114,11 @@ Page({
     request.get('/bxe-mall/product/list', this.data.form).then(result => {
       //成功回调
       this.data.requesting = false
-      this.setData({ focus: false })
+      if(this.data.form.pageNum == 1){
+        this.setData({ focus: false, top: 0 })
+      } else {
+        this.setData({ focus: false })
+      }
       if (result.data.records.length) {
         var respList = result.data.records
         let nowList = `taskList[${this.data.taskList.length}]`
diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml
index f7ebae6..19238e7 100644
--- a/pages/mall/search-list/index.wxml
+++ b/pages/mall/search-list/index.wxml
@@ -35,7 +35,7 @@
 		<image class="img-empty" src="/assets/image/list_empty.png"></image>
 		<view class="text-empty">暂无数据</view>
 	</view>
-	<scroll-view scroll-y style="height:{{height}}rpx;padding: 0rpx 24rpx" wx:else bindscrolltolower="fetchTaskList">
+	<scroll-view scroll-y scroll-top="{{top}}" style="height:{{height}}rpx;padding: 0rpx 24rpx" wx:else bindscrolltolower="fetchTaskList">
 		<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{taskList}}" wx:key="pageIndex">
 			<view class="flex content" wx:for="{{pageItem}}" wx:key="index" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
 				<wux-image width="{{120}}" height="{{120}}" wux-class="page-icon" src="{{item.litimgUrl}}" mode="{{aspectFill}}">
diff --git a/pages/mall/shops/index.js b/pages/mall/shops/index.js
index 7c52235..d959ea3 100644
--- a/pages/mall/shops/index.js
+++ b/pages/mall/shops/index.js
@@ -14,6 +14,7 @@ Page({
     height: app.globalData.fragmentHeight - 180,
     CustomBar: app.globalData.CustomBar,
     scroll: true,
+    top: 0,
     pageIndex: 0,
     pageList: [],
     tabs: [],
@@ -107,7 +108,11 @@ Page({
   fetchCheapList: function () {
     request.get('/bxe-mall/product/cheapList', this.data.form).then(result => {
       //成功回调
-      this.setData({ loading: false, cheapList: result.data })
+      if(this.data.form.pageNum == 1){
+        this.setData({ loading: false, top: 0, cheapList: result.data })
+      } else {
+        this.setData({ loading: false, cheapList: result.data })
+      }
     })
   },
   // 获取团购列表
diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml
index c78ade8..f601268 100644
--- a/pages/mall/shops/index.wxml
+++ b/pages/mall/shops/index.wxml
@@ -28,7 +28,7 @@
 </view>
 <view style="height:200rpx;width:100%"></view>
 
-<refresh-view bind:refresh="onRefreshList" height="{{height}}" triggered="{{ requesting }}" bind:scrolltolower="fetchTaskList">
+<refresh-view bind:refresh="onRefreshList" height="{{height}}" scrollTop="{{top}}" triggered="{{requesting}}" bind:scrolltolower="fetchTaskList">
 
 	<view wx:if="{{loading}}" class="page__bd page__bd_spacing">
 		<view class="sub-title"></view>