From 3ba56b4142dd3d6ef808a4e1fd14ba5d1e03d4df Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 22 Mar 2022 19:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E6=8C=81APP?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/uni-notice-bar/uni-notice-bar.vue      |  2 +-
 components/vc-category/vc-category.vue            |  3 ++-
 components/vc-discount/vc-discount.vue            |  4 ++--
 .../vc-recommend-homemaking.vue                   |  2 +-
 components/vc-recommend/vc-recommend.vue          |  2 +-
 components/vc-shop/vc-shop.vue                    |  2 +-
 conf/config.js                                    | 11 +++++++----
 factory/WexinAppPayFactory.js                     |  2 +-
 lib/java110/page/PageApp.js                       | 15 +++++++++++----
 lib/java110/utils/LogUtil.js                      |  4 ++--
 lib/java110/utils/StorageUtil.js                  |  5 +++++
 pages/complaint/complaint.vue                     |  2 ++
 pages/index/index.vue                             | 10 +++++-----
 pages/mall/mall.vue                               |  3 ++-
 pages/repair/repair.vue                           |  2 ++
 15 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/components/uni-notice-bar/uni-notice-bar.vue b/components/uni-notice-bar/uni-notice-bar.vue
index 8399eca..8e91981 100755
--- a/components/uni-notice-bar/uni-notice-bar.vue
+++ b/components/uni-notice-bar/uni-notice-bar.vue
@@ -74,7 +74,7 @@
 			},
 			speed: {
 				// 默认1s滚动100px
-				type: Number,
+				type: String,
 				default: 100
 			},
 			color: {
diff --git a/components/vc-category/vc-category.vue b/components/vc-category/vc-category.vue
index 7513a2f..e541eda 100644
--- a/components/vc-category/vc-category.vue
+++ b/components/vc-category/vc-category.vue
@@ -1,5 +1,6 @@
 <template>
-	<scroll-view @scrolltolower="lower" class="scroll-restaurants-list " scroll-y="true" style="height:300upx">
+	<!--  @scrolltolower="lower" -->
+	<scroll-view class="scroll-restaurants-list " scroll-y="true" style="height:300upx">
 		<swiper class=" padding-top-xs margin-top-sm bg-white c-radius" style="height: 280upx;" indicator-dots="true" indicator-color="rgba(228,228,228,1)"
 		 indicator-active-color="#FECA49">
 			<block v-for="(item, index) in categoryList" :key="index">
diff --git a/components/vc-discount/vc-discount.vue b/components/vc-discount/vc-discount.vue
index c4dafe4..414c7e8 100644
--- a/components/vc-discount/vc-discount.vue
+++ b/components/vc-discount/vc-discount.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view v-if="discounts.length > 0">
+		<view v-if="discounts && discounts.length > 0">
 			<view class="block__title">折扣信息</view>
 			<view class="cu-list menu" v-if="discounts.length > 0" v-for="(discount, idx) in discounts" :key="idx" :data-item="discount"
 			 @click="_viewDiscountDetail(discount)">
@@ -16,7 +16,7 @@
 				</view>
 			</view>
 		</view>
-		<blockExplain v-if="discounts.length > 0"></blockExplain>
+		<blockExplain v-if="discounts && discounts.length > 0"></blockExplain>
 	</view>
 </template>
 
diff --git a/components/vc-recommend-homemaking/vc-recommend-homemaking.vue b/components/vc-recommend-homemaking/vc-recommend-homemaking.vue
index c6e9fce..16db4d3 100644
--- a/components/vc-recommend-homemaking/vc-recommend-homemaking.vue
+++ b/components/vc-recommend-homemaking/vc-recommend-homemaking.vue
@@ -1,5 +1,5 @@
 <template>
-  <view v-if="products.length > 0">
+  <view v-if="products && products.length > 0">
 
     <view v-for="(item,indexs) in products" :key="indexs" class="margin-top recommend-block">
       <view class="text-left ">
diff --git a/components/vc-recommend/vc-recommend.vue b/components/vc-recommend/vc-recommend.vue
index 3a14edb..f916049 100644
--- a/components/vc-recommend/vc-recommend.vue
+++ b/components/vc-recommend/vc-recommend.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="margin-top" v-if="products.length > 0">
+	<view class="margin-top" v-if="products && products.length > 0">
 
 		<view v-for="(item,indexs) in products" :key="indexs">
 			<view class="text-left ">
diff --git a/components/vc-shop/vc-shop.vue b/components/vc-shop/vc-shop.vue
index b8e5402..149fd75 100644
--- a/components/vc-shop/vc-shop.vue
+++ b/components/vc-shop/vc-shop.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="vc-shop margin-top " v-if="shops.length>0">
+	<view class="vc-shop margin-top " v-if="shops && shops.length>0">
 		<view class="text-left margin-left-xs margin-bottom-sm">
 			<text class="recommend-title">附近商家</text>
 		</view>
diff --git a/conf/config.js b/conf/config.js
index d759c1b..37594c6 100755
--- a/conf/config.js
+++ b/conf/config.js
@@ -12,6 +12,12 @@
 // 服务器域名 公众号时，配置为 / 就可以
 const baseUrl = '/';
 // #endif
+
+// #ifndef H5
+//服务器域名 小程序 或者 app 时 后端地址
+const baseUrl = 'http://demo.homecommunity.cn/';
+// #endif
+
 const commonBaseUrl = 'http://demo.homecommunity.cn/';
 
 //商城的url
@@ -22,10 +28,7 @@ const mallUrlIndexPage = mallUrl + '#/pages/index/index?mallFrom=HC';
 //商城token 刷新页面
 const mallUrlRefresh = mallUrl + "#/pages/mallTokenRefresh/mallTokenRefresh?mallFrom=HC"
 
-// #ifndef H5
-//服务器域名 小程序 或者 app 时 后端地址
-const baseUrl = 'http://demo.homecommunity.cn/';
-// #endif
+
 
 //默认的小区ID和名称，用户还没有登录时显示的小区信息
 
diff --git a/factory/WexinAppPayFactory.js b/factory/WexinAppPayFactory.js
index aa81e7f..320d229 100644
--- a/factory/WexinAppPayFactory.js
+++ b/factory/WexinAppPayFactory.js
@@ -1,7 +1,7 @@
 
 import conf from '../conf/config.js'
 
-import md5 from '../utils/md5Util.js'
+import md5 from '../lib/java110/utils/md5Util.js'
 /*
 * 生成订单信息
 * @params orderInfo: any 后端返回的数据，格式和上面一样
diff --git a/lib/java110/page/PageApp.js b/lib/java110/page/PageApp.js
index 21bc2bd..5236de3 100644
--- a/lib/java110/page/PageApp.js
+++ b/lib/java110/page/PageApp.js
@@ -1,10 +1,17 @@
+import {
+	requestNoAuth
+} from '../java110Request.js'
 import {
 	saveOwnerStorage,
 	saveUserLoginInfo,
 	getWAppId,
-	saveWAppId
+	saveWAppId,
+	getLoginFlag,
+	getOwnerKey
 } from '../utils/StorageUtil.js'
 
+import conf from '../../../config.js'
+
 import url from '../../../constant/url.js'
 export function pageOnLoad(options) {
 
@@ -23,16 +30,16 @@ export function getPageWAppId() {
 
 export function pageCheckSession(_pageUrl,_call) {
 	let _that = this;
-	let loginFlag = wx.getStorageSync(mapping.LOGIN_FLAG);
+	let loginFlag = getLoginFlag();
 	let nowDate = new Date();
 
 	if (loginFlag && loginFlag.expireTime > nowDate.getTime()) {
-		call();
+		_call();
 		return;
 	}
 
 	//查询临时钥匙
-	let _key = wx.getStorageSync(mapping.OWNER_KEY);
+	let _key = getOwnerKey();;
 	if (_key) {
 		doLoginOwnerByKey(_key, _call);
 	} else {
diff --git a/lib/java110/utils/LogUtil.js b/lib/java110/utils/LogUtil.js
index 7427342..e942942 100644
--- a/lib/java110/utils/LogUtil.js
+++ b/lib/java110/utils/LogUtil.js
@@ -23,9 +23,9 @@ const ERROR = "ERROR";
  * @param {Object} msg 打印内容
  */
 export function debug(fileName,method,msg) {
-	if (logLevel == DEBUG) {
+	//if (logLevel == DEBUG) {
 		console.log(formatTimeNow()+' ' + '[java110-debug] - ' + fileName + ':'+method+' ',msg);
-	}
+	//}
 }
 
 /**
diff --git a/lib/java110/utils/StorageUtil.js b/lib/java110/utils/StorageUtil.js
index bab20c7..3f98d09 100644
--- a/lib/java110/utils/StorageUtil.js
+++ b/lib/java110/utils/StorageUtil.js
@@ -92,6 +92,11 @@ export function getLoginFlag(){
 	return loginFlag;
 }
 
+export function getOwnerKey(){
+	let ownerKey = wx.getStorageSync(OWNER_KEY);
+	return ownerKey;
+}
+
 /**
  * 获取wAppId
  */
diff --git a/pages/complaint/complaint.vue b/pages/complaint/complaint.vue
index 08c83b2..e159d35 100755
--- a/pages/complaint/complaint.vue
+++ b/pages/complaint/complaint.vue
@@ -112,6 +112,8 @@
 				that.roomIdArr = roomIdArr;
 				that.userId = res.data.owner.appUserId;
 				that.communityId = res.data.owner.communityId;
+				that.complaintName = res.data.owner.appUserName;
+				that.tel = res.data.owner.link;
 			});
 		},
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index abc8d31..b5b0c4f 100755
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,8 +3,8 @@
 		<view class="margin-bottom-xs">
 			<uni-notice-bar showIcon="true" scrollable="true" single="true" speed="30" text="欢迎访问HC智慧家园"></uni-notice-bar>
 		</view>
-
-		<scroll-view @scrolltolower="lower" class="scroll-restaurants-list" scroll-y="true" style="height:100%">
+		<!--@scrolltolower="lower"-->
+		<scroll-view  class="scroll-restaurants-list" scroll-y="true" style="height:100%">
 			<swiper class="categoryList padding-top-xs bg-white" indicator-dots="true" indicator-color="rgba(228,228,228,1)"
 			 indicator-active-color="#FECA49">
 				<block v-for="(item, index) in categoryList" :key="index">
@@ -36,8 +36,8 @@
 					</swiper-item>
 				</block>
 			</swiper>
-
-			<scroll-view scroll-x class="bg-white nav" scroll-with-animation :scroll-left="scrollLeft">
+			<!--:scroll-left="scrollLeft"-->
+			<scroll-view scroll-x class="bg-white nav" scroll-with-animation >
 				<view class="cu-item" :class="item.typeCd==curTypeCd?'text-green cur':''" v-for="(item,index) in activitiTitle"
 				 :key="index" @tap="selectActiviti(item)" :data-id="index">
 					{{item.typeName}}
@@ -106,7 +106,7 @@
 				row: 7,
 				activitiTitle: [],
 				curTypeCd: '',
-				categoryList: {},
+				categoryList: [],
 				selected: 0,
 				mask1Hidden: true,
 				mask2Hidden: true,
diff --git a/pages/mall/mall.vue b/pages/mall/mall.vue
index 0a15873..3411092 100644
--- a/pages/mall/mall.vue
+++ b/pages/mall/mall.vue
@@ -11,7 +11,8 @@
 			</view>
 		</view>
 		<view class="">
-			<scroll-view scroll-x class="nav nav-scroll  padding-bottom-xs" scroll-with-animation :scroll-left="scrollLeft">
+			<!--:scroll-left="scrollLeft"-->
+			<scroll-view scroll-x class="nav nav-scroll  padding-bottom-xs" scroll-with-animation >
 				<view class="cu-item text-white" :class="item.shopTypeId==shopTypeId?'nav-cur':''"
 					v-for="(item,index) in navList" :key="index" @tap="selectType(index)" :data-id="index">
 					{{item.typeName}}
diff --git a/pages/repair/repair.vue b/pages/repair/repair.vue
index a174a55..65926ae 100755
--- a/pages/repair/repair.vue
+++ b/pages/repair/repair.vue
@@ -191,6 +191,8 @@
 				that.roomIdArr = roomIdArr;
 				that.userId = res.data.owner.userId;
 				that.userName = res.data.owner.appUserName;
+				that.bindRepairName = that.userName;
+				that.bindTel = res.data.owner.link;
 				that.communityId = res.data.owner.communityId;
 				that.communityName = res.data.owner.communityName;
 			});