From 92e7660543cdddadf9b66f17b9af8512ec7b1686 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 17 Mar 2021 14:04:35 +0800
Subject: [PATCH] no message

---
 app.js                         | 26 +++++++++++++-------------
 pages/agent/factory/index.wxml | 16 ++++++++++------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app.js b/app.js
index 9ab2972..a4be9df 100644
--- a/app.js
+++ b/app.js
@@ -1,16 +1,16 @@
- //app.js
+//app.js
 App({
-   //----------------------------------------------globalData--------------------------------------
-   evn: 2,//0:开发环境，1：测试环境，2：生产环境
-   tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
-   agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
-   version: 152,
-   xAppId: '470236309865238528',
-   globalData: {
-     userInfo: null,
-     openId: null,
-     token: null,
-     isIos: false,
-     kg: 0
+  //----------------------------------------------globalData--------------------------------------
+  evn: 0,//0:开发环境，1：测试环境，2：生产环境
+  tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
+  agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
+  version: 152,
+  xAppId: '470236309865238528',
+  globalData: {
+    userInfo: null,
+    openId: null,
+    token: null,
+    isIos: false,
+    kg: 0
   }
 })
\ No newline at end of file
diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml
index fd54f14..7c0d35b 100644
--- a/pages/agent/factory/index.wxml
+++ b/pages/agent/factory/index.wxml
@@ -7,11 +7,12 @@
 <scroll-view scroll-y style="height: {{height}}rpx;" bindscroll="onScroll" scroll-into-view="{{toView}}" bind:scrolltolower="fetchMomentList" wx:if="{{factoryDetail}}">
 	<view class="bg-white flex" style="padding:30rpx">
 		<wux-image width="{{54}}" height="{{54}}" wux-class="image" shape="rounded" src="{{factoryDetail.logoImg}}" />
-		<view class="flex flex-column flex-center" style="margin-left:24rpx;align-items:flex-start">
-			<view  class="text-sg text-bold" style="white-space: nowrap;width: 100%;">{{factoryDetail.name}}
-				<!-- <view class="{{hasFollowed == false ? 'text-blue' : 'text-red'}}" data-cid="{{hasFollowed}}" bindtap="onAttentionChange">{{hasFollowed == false ? '关注' : '取消关注'}}</view>
-			</view> -->
-				<view style="float:right;width: 120rpx;height: 50rpx;background-color: rgba(0,0,0,0.10);font-size: 24rpx;border-radius: 25rpx;text-align: center;padding-top: 8rpx;" data-cid="{{hasFollowed}}" bindtap="onAttentionChange"><text class="{{hasFollowed == false ? 'text-blue' : 'text-red'}}">{{hasFollowed == false ? '关注' : '取消关注'}}</text></view>
+		<view class="flex flex-column flex-center" style="margin-left:24rpx;align-items:flex-start;width: 100%">
+			<view class="text-sg text-bold" style="white-space: nowrap;width: 100%;">
+			  <text>{{factoryDetail.name}}</text>
+				<view style="float:right;width: 160rpx;height: 50rpx;background-color: rgba(0,0,0,0.10);font-size: 24rpx;border-radius: 25rpx;text-align: center;padding-top: 8rpx;" data-cid="{{hasFollowed}}" bindtap="onAttentionChange">
+					<text class="{{hasFollowed == false ? 'text-blue' : 'text-red'}}">{{hasFollowed == false ? '关注' : '取消关注'}}</text>
+				</view>
 			</view>
 			<view class="text-xs text-gray" style="margin-top:4rpx">
 				<text>{{factoryDetail.locProvinceName + factoryDetail.locCityName + factoryDetail.locDistrictName}}</text>
@@ -56,7 +57,10 @@
 					<view class="item-cate {{cateIndex == index ? 'cate-tag' : ''}}" wx:for="{{factoryDetail.paperCategoryList}}" wx:key="index" data-index="{{index}}" bindtap="checkTag">
 						<view class="flex flex-justify">
 							<view class="text-sg text-black">{{item.categoryName}}</view>
-							<text class="text-sg text-black" wx:if="{{item.unitPrice}}">{{formate.formatePrice2(item.unitPrice, kg)}}</text>
+							<text class="text-sg text-black" wx:if="{{item.unitPrice}}">
+							  <text>{{formate.formatePrice2(item.unitPrice, kg)}}</text>
+								<text>+补贴50元/吨</text>
+							</text>
 							<text class="text-sg text-gray" wx:else>暂无报价</text>
 						</view>
 						<view class="flex flex-justify text-xs text-gray" style="margin-top:4rpx">