From 2b4ad0dff4bdd5c5963888c79dfaceb6fece67de Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Tue, 26 Jan 2021 17:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                   |  2 +-
 pages/agent/factory/index.wxml           | 28 +++++++++++++-----------
 pages/home/attentionPaperList/index.wxml |  2 +-
 pages/home/attentionPaperList/index.wxss | 15 +++++++++++++
 pages/home/info/index.wxml               |  2 +-
 pages/home/tab4/index.wxml               |  2 +-
 pages/home/tab4/index.wxss               | 15 +++++++++++++
 pages/home/tab5/index.wxml               |  2 +-
 pages/home/tab5/index.wxss               | 15 +++++++++++++
 9 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/app.js b/app.js
index 6ddae6a..ade7531 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
  //app.js
 App({
    //----------------------------------------------globalData--------------------------------------
-   evn: 1,//0:开发环境，1：测试环境，2：生产环境
+   evn: 0,//0:开发环境，1：测试环境，2：生产环境
    tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
    agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
    version: 152,
diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml
index 4c71470..fd54f14 100644
--- a/pages/agent/factory/index.wxml
+++ b/pages/agent/factory/index.wxml
@@ -5,22 +5,24 @@
 </cu-custom>
 
 <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" >
+	<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">{{factoryDetail.name}}
-			<text class="{{hasFollowed == false ? 'text-blue' : 'text-red'}}" data-cid="{{hasFollowed}}" bindtap="onAttentionChange">{{hasFollowed == false ? '关注' : '取消关注'}}</text>
+			<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>
 			<view class="text-xs text-gray" style="margin-top:4rpx">
 				<text>{{factoryDetail.locProvinceName + factoryDetail.locCityName + factoryDetail.locDistrictName}}</text>
 				<text class="text-gray" style="margin: 0rpx 8rpx" wx:if="{{factoryDetail.cumulativeWeight > 0}}">|</text>
-			  <text wx:if="{{factoryDetail.cumulativeWeight > 0}}">已代卖：{{formate.formateWeight(factoryDetail.cumulativeWeight, kg)}}</text>
-			  <text class="text-gray" style="margin: 0rpx 8rpx">|</text>
-			  <text wx:if="{{factoryDetail.yesterdayTotalQuantity &&factoryDetail.yesterdayTotalQuantity >= 0}}">昨日排队：{{factoryDetail.yesterdayTotalQuantity}}辆</text>
+				<text wx:if="{{factoryDetail.cumulativeWeight > 0}}">已代卖：{{formate.formateWeight(factoryDetail.cumulativeWeight, kg)}}</text>
+				<text class="text-gray" style="margin: 0rpx 8rpx">|</text>
+				<text wx:if="{{factoryDetail.yesterdayTotalQuantity &&factoryDetail.yesterdayTotalQuantity >= 0}}">昨日排队：{{factoryDetail.yesterdayTotalQuantity}}辆</text>
 				<text wx:else>昨日排队：--</text>
 			</view>
 			<view class="flex text-df" style="margin-top:4rpx">
-		    <view class="flex" wx:if="{{factoryDetail.proxypaySurcharge}}">
+				<view class="flex" wx:if="{{factoryDetail.proxypaySurcharge}}">
 					<text class="text-black">代卖费：</text>
 					<text class="text-red">{{formate.formatePrice2(factoryDetail.proxypaySurcharge, kg)}}</text>
 				</view>
@@ -28,7 +30,7 @@
 					<text class="text-black">纸厂账期：</text>
 					<text class="text-red">{{factoryDetail.foreignPaybackIntever}}天</text>
 				</view>
-	    </view>
+			</view>
 		</view>
 	</view>
 	<!-- <view style="height:16rpx"></view> -->
@@ -59,7 +61,7 @@
 						</view>
 						<view class="flex flex-justify text-xs text-gray" style="margin-top:4rpx">
 							<text>价格更新：{{factoryDetail.priceDate}}</text>
-				      <view class="flex flex-center" style="padding:6rpx 0rpx" wx:if="{{item.floatingPrice > 0}}">
+							<view class="flex flex-center" style="padding:6rpx 0rpx" wx:if="{{item.floatingPrice > 0}}">
 								<text class="cuIcon-refresharrow text-red transform" style="font-size:24rpx;margin-top:2rpx;"></text>
 								<text class="text-red text-xs" style="padding-top:2rpx">{{formate.formatePrice(item.floatingPrice, kg)}}</text>
 								<text class="text-xs text-gray" style="margin-left:16rpx">较昨日</text>
@@ -116,28 +118,28 @@
 				<view style="padding: 24rpx 30rpx;">
 					<view class="flex" style="align-items: center">
 						<text style="width:8rpx;height:30rpx;background-color:#008AFF"></text>
-					  <text class="text-lg text-bold" style="margin-left:12rpx">报车</text>
+						<text class="text-lg text-bold" style="margin-left:12rpx">报车</text>
 					</view>
 					<view class="text-df" style="padding: 30rpx 0rpx">{{factoryDetail.attentionsReportCar}}</view>
 				</view>
 				<view style="padding: 24rpx 30rpx;border-top:2rpx solid #eee">
 					<view class="flex" style="align-items: center">
 						<text style="width:8rpx;height:30rpx;background-color:#008AFF"></text>
-					  <text class="text-lg text-bold" style="margin-left:12rpx">装车</text>
+						<text class="text-lg text-bold" style="margin-left:12rpx">装车</text>
 					</view>
 					<view class="text-df" style="padding: 30rpx 0rpx">{{factoryDetail.attentionsLoadingCar}}</view>
 				</view>
 				<view style="padding: 24rpx 30rpx;border-top:2rpx solid #eee">
 					<view class="flex" style="align-items: center">
 						<text style="width:8rpx;height:30rpx;background-color:#008AFF"></text>
-					  <text class="text-lg text-bold" style="margin-left:12rpx">到货</text>
+						<text class="text-lg text-bold" style="margin-left:12rpx">到货</text>
 					</view>
 					<view class="text-df" style="padding: 30rpx 0rpx">{{factoryDetail.attentionsArrival}}</view>
 				</view>
 				<view style="padding: 24rpx 30rpx;border-top:2rpx solid #eee">
 					<view class="flex" style="align-items: center">
 						<text style="width:8rpx;height:30rpx;background-color:#008AFF"></text>
-					  <text class="text-lg text-bold" style="margin-left:12rpx">卸货规定</text>
+						<text class="text-lg text-bold" style="margin-left:12rpx">卸货规定</text>
 					</view>
 					<view class="text-df" style="padding: 30rpx 0rpx">{{factoryDetail.attentionsRegulations}}</view>
 				</view>
diff --git a/pages/home/attentionPaperList/index.wxml b/pages/home/attentionPaperList/index.wxml
index a920215..f2bba7f 100644
--- a/pages/home/attentionPaperList/index.wxml
+++ b/pages/home/attentionPaperList/index.wxml
@@ -27,7 +27,7 @@
 		<view class="bottom">
 			<view>
 				<checkbox-group bindchange="checkboxChange">
-					<checkbox wx:for="{{ categoryListone }}" wx:key="index" style="width:100%;margin-top:15rpx" value="{{item.paperMillId}}" checked="{{item.hasFollowed}}">{{item.name}}</checkbox>
+					<checkbox wx:for="{{ categoryListone }}" wx:key="index" class="interestthreecheckbox" style="width:100%;margin-top:30rpx" value="{{item.paperMillId}}" checked="{{item.hasFollowed}}">{{item.name}}</checkbox>
 				</checkbox-group>
 			</view>
 		</view>
diff --git a/pages/home/attentionPaperList/index.wxss b/pages/home/attentionPaperList/index.wxss
index d98beaf..9277633 100644
--- a/pages/home/attentionPaperList/index.wxss
+++ b/pages/home/attentionPaperList/index.wxss
@@ -59,4 +59,19 @@ page{
   box-shadow: 0px 10px 13px -8px rgba(35, 126, 217, 0.53);
 	color: white;
 	font-size: 32rpx;
+}
+.interestthreecheckbox .wx-checkbox-input {
+  border-radius: 50%;
+  width: 40rpx;
+  height: 40rpx;
+}
+.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked{
+  background: white;
+  border: 1px solid #007AFF;
+}
+.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked::before{
+  width: 40rpx;/* 选中后对勾大小 */
+  height: 40rpx;/* 选中后对勾大小 */
+  font-size:40rpx; /* 对勾大小30rpx */
+  color:#007AFF; /* 对勾颜色 白色 */
 }
\ No newline at end of file
diff --git a/pages/home/info/index.wxml b/pages/home/info/index.wxml
index 07d325f..df4537f 100644
--- a/pages/home/info/index.wxml
+++ b/pages/home/info/index.wxml
@@ -97,7 +97,7 @@
 	</wux-cell>
 	<wux-cell wx:if="{{userType == 1}}" is-link data-cid='numberMoon' data-tag='打包机数' bind:click="showDialog">
 		<view slot="header" class="text-gray">打包机数</view>
-		<view slot="footer" class="{{userInfo.numberOfPackageMachine? 'text-black':'text-gray'}}">{{userInfo.numberOfPackageMachine || '点击修改工厂人数'}}</view>
+		<view slot="footer" class="{{userInfo.numberOfPackageMachine? 'text-black':'text-gray'}}">{{userInfo.numberOfPackageMachine || '点击修改工厂打包机数'}}</view>
 	</wux-cell>
 
 	<wux-cell wx:if="{{userType == 1}}" is-link data-cid='numberMoon' data-tag='营业执照' bind:click="toBusinessLicense">
diff --git a/pages/home/tab4/index.wxml b/pages/home/tab4/index.wxml
index 25b0145..614c982 100644
--- a/pages/home/tab4/index.wxml
+++ b/pages/home/tab4/index.wxml
@@ -23,7 +23,7 @@
 			<wux-accordion-group title="">
 				<checkbox-group bindchange="checkboxChange">
 					<wux-accordion wx:for="{{ categoryListone }}" wx:key="index" title="{{index+1+'、'+item.categoryName}}">
-						<checkbox style="width:100%;margin-top:15rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
+						<checkbox class="interestthreecheckbox" style="width:100%;margin-top:30rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
 					</wux-accordion>
 				</checkbox-group>
 			</wux-accordion-group>
diff --git a/pages/home/tab4/index.wxss b/pages/home/tab4/index.wxss
index 9e08e56..f4477ff 100644
--- a/pages/home/tab4/index.wxss
+++ b/pages/home/tab4/index.wxss
@@ -61,4 +61,19 @@ page{
   color: white;
   font-size: 32rpx;
   margin-left: 32rpx;
+}
+.interestthreecheckbox .wx-checkbox-input {
+  border-radius: 50%;
+  width: 40rpx;
+  height: 40rpx;
+}
+.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked{
+  background: white;
+  border: 1px solid #007AFF;
+}
+.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked::before{
+  width: 40rpx;/* 选中后对勾大小 */
+  height: 40rpx;/* 选中后对勾大小 */
+  font-size:40rpx; /* 对勾大小30rpx */
+  color:#007AFF; /* 对勾颜色 白色 */
 }
\ No newline at end of file
diff --git a/pages/home/tab5/index.wxml b/pages/home/tab5/index.wxml
index 0c50ccf..43b62b8 100644
--- a/pages/home/tab5/index.wxml
+++ b/pages/home/tab5/index.wxml
@@ -23,7 +23,7 @@
 			<wux-accordion-group title="">
 				<checkbox-group bindchange="checkboxChange">
 					<wux-accordion wx:for="{{ categoryListone }}" wx:key="index" title="{{index+1+'、'+item.categoryName}}">
-						<checkbox style="width:100%;margin-top:15rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
+						<checkbox class="interestthreecheckbox" style="width:100%;margin-top:30rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
 					</wux-accordion>
 				</checkbox-group>
 			</wux-accordion-group>
diff --git a/pages/home/tab5/index.wxss b/pages/home/tab5/index.wxss
index 9e08e56..f4477ff 100644
--- a/pages/home/tab5/index.wxss
+++ b/pages/home/tab5/index.wxss
@@ -61,4 +61,19 @@ page{
   color: white;
   font-size: 32rpx;
   margin-left: 32rpx;
+}
+.interestthreecheckbox .wx-checkbox-input {
+  border-radius: 50%;
+  width: 40rpx;
+  height: 40rpx;
+}
+.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked{
+  background: white;
+  border: 1px solid #007AFF;
+}
+.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked::before{
+  width: 40rpx;/* 选中后对勾大小 */
+  height: 40rpx;/* 选中后对勾大小 */
+  font-size:40rpx; /* 对勾大小30rpx */
+  color:#007AFF; /* 对勾颜色 白色 */
 }
\ No newline at end of file