From d23f7a910905ade09a099c388c3e21add757ad76 Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Mon, 28 Jul 2025 18:54:09 +0800
Subject: [PATCH] update

---
 pages.json                                    |  124 +-
 pages/ProductReview/ProductReview.vue         |  166 +++
 .../ProductReview/components/businessUnit.vue |   89 ++
 .../components/newBusinessUnit.vue            |   88 ++
 pages/ProductReview/newApproval.vue           |  147 +++
 pages/ProductReview/newDetail.vue             | 1076 +++++++++++++++++
 pages/ProductReview/productDetail.vue         |  646 ++++++++++
 pages/ProductReview/transferPage.vue          |   47 +
 pages/everdayRenven/index.vue                 |  398 ++----
 pages/index/index.vue                         |   91 +-
 pages/walkAroundManager/index.vue             |  115 +-
 static/images/revenue/734100.png              |  Bin 0 -> 23131 bytes
 12 files changed, 2636 insertions(+), 351 deletions(-)
 create mode 100644 pages/ProductReview/ProductReview.vue
 create mode 100644 pages/ProductReview/components/businessUnit.vue
 create mode 100644 pages/ProductReview/components/newBusinessUnit.vue
 create mode 100644 pages/ProductReview/newApproval.vue
 create mode 100644 pages/ProductReview/newDetail.vue
 create mode 100644 pages/ProductReview/productDetail.vue
 create mode 100644 pages/ProductReview/transferPage.vue
 create mode 100644 static/images/revenue/734100.png

diff --git a/pages.json b/pages.json
index 8915ba0..780693a 100644
--- a/pages.json
+++ b/pages.json
@@ -29,7 +29,8 @@
     "subPackages": [ //分包加载配置
         {
             "root": "pages/authorityApproval",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "权限审批",
@@ -47,7 +48,8 @@
         },
         {
             "root": "pages/auditingPop",
-            "pages": [{
+            "pages": [
+                {
                     "path": "jointlySign",
                     "style": {
                         "navigationBarTitleText": "会签"
@@ -75,7 +77,8 @@
         },
         {
             "root": "pages/settlementApproval",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "navigationStyle": "custom"
@@ -118,7 +121,8 @@
         },
         {
             "root": "pages/operatingStatements",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "经营报表",
@@ -149,7 +153,8 @@
         },
         {
             "root": "pages/walkAroundManager",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "上传走动式管理",
@@ -173,7 +178,8 @@
         },
         {
             "root": "pages/tender",
-            "pages": [{
+            "pages": [
+                {
                     "path": "tender",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -209,7 +215,8 @@
         },
         {
             "root": "pages/mbwa",
-            "pages": [{
+            "pages": [
+                {
                     "path": "mbwa",
                     "style": {
                         "navigationBarTitleText": "走动式管理",
@@ -238,7 +245,8 @@
         },
         {
             "root": "pages/serviceAreaReimbursement",
-            "pages": [{
+            "pages": [
+                {
                     "path": "serviceAreaReimbursement",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -256,7 +264,8 @@
         },
         {
             "root": "pages/dataSummary",
-            "pages": [{
+            "pages": [
+                {
                     "path": "dataSummary",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -280,7 +289,8 @@
         },
         {
             "root": "pages/askForLeave",
-            "pages": [{
+            "pages": [
+                {
                     "path": "askForLeave",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -309,7 +319,8 @@
         },
         {
             "root": "pages/officialDocManagement",
-            "pages": [{
+            "pages": [
+                {
                     "path": "officialDocManagement",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -338,7 +349,8 @@
         },
         {
             "root": "pages/businessApproval",
-            "pages": [{
+            "pages": [
+                {
                     "path": "businessApproval",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -374,7 +386,8 @@
         },
         {
             "root": "pages/everdayRenven",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": false,
@@ -420,7 +433,8 @@
         },
         {
             "root": "pages/suggestion",
-            "pages": [{
+            "pages": [
+                {
                     "path": "suggestion",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -437,7 +451,8 @@
         },
         {
             "root": "pages/projectWarning",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "分润比例切换"
@@ -455,7 +470,8 @@
         },
         {
             "root": "pages/contract",
-            "pages": [{
+            "pages": [
+                {
                     "path": "contract",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -472,7 +488,8 @@
         },
         {
             "root": "pages/cashAudit",
-            "pages": [{
+            "pages": [
+                {
                     "path": "list",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -495,7 +512,8 @@
         },
         {
             "root": "pages/investment",
-            "pages": [{
+            "pages": [
+                {
                     "path": "investment",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -512,7 +530,8 @@
         },
         {
             "root": "pages/publicity",
-            "pages": [{
+            "pages": [
+                {
                     "path": "publicity",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -529,7 +548,8 @@
         },
         {
             "root": "pages/expenseApproval",
-            "pages": [{
+            "pages": [
+                {
                     "path": "expenseApproval",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -547,7 +567,8 @@
         },
         {
             "root": "pages/commodity_temp",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -565,7 +586,8 @@
         },
         {
             "root": "pages/autoTest/serverpartshoptotalsummary",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -582,7 +604,8 @@
         },
         {
             "root": "pages/autoTest/shopmobilesummary",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -599,7 +622,8 @@
         },
         {
             "root": "pages/autoTest/endaccountreport",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -616,7 +640,8 @@
         },
         {
             "root": "pages/autoTest/abnormalauditreport",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -633,7 +658,8 @@
         },
         {
             "root": "pages/autoTest/serverpartreport",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -650,7 +676,8 @@
         },
         {
             "root": "pages/autoTest/abnormalauditsummary",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -667,7 +694,8 @@
         },
         {
             "root": "pages/autoTest/abnormalaudit",
-            "pages": [{
+            "pages": [
+                {
                     "path": "index",
                     "style": {
                         "enablePullDownRefresh": true,
@@ -681,6 +709,43 @@
                     }
                 }
             ]
+        },
+        {
+            "root": "pages/ProductReview",
+            "pages": [
+                {
+                    "path": "ProductReview",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "商品审批"
+                    }
+                },
+                {
+                    "path": "productDetail",
+                    "style": {
+                        "navigationBarTitleText": "商品审批"
+                    }
+                },
+                {
+                    "path": "newDetail",
+                    "style": {
+                        "navigationBarTitleText": "商品审批"
+                    }
+                },
+                {
+                    "path": "newApproval",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "商品审批"
+                    }
+                },
+                {
+                    "path": "transferPage",
+                    "style": {
+                        "navigationBarTitleText": ""
+                    }
+                }
+            ]
         }
     ],
     "globalStyle": {
@@ -694,7 +759,8 @@
         "selectedColor": "#3295f9",
         "borderStyle": "black",
         "backgroundColor": "#ffffff",
-        "list": [{
+        "list": [
+            {
                 "pagePath": "pages/index/index",
                 "iconPath": "static/images/tab/home.png",
                 "selectedIconPath": "static/images/tab/homeActive.png",
diff --git a/pages/ProductReview/ProductReview.vue b/pages/ProductReview/ProductReview.vue
new file mode 100644
index 0000000..7336594
--- /dev/null
+++ b/pages/ProductReview/ProductReview.vue
@@ -0,0 +1,166 @@
+<template>
+	<view class="content">
+		<!-- 	<view style="flex: 1;overflow: hidden;" >
+			<scroll-view scroll-y="true" style="height: 100%;width: 100%;" @scrolltolower="loadMore"> -->
+		<view v-if="pageList.length > 0">
+			<list-unit v-for="(item, index) in pageList" :key="index" :item="item" :i="index"
+				@goDetail="goDetail"></list-unit>
+
+		</view>
+		<view v-else-if="!pageData.isLoading" style="height: 100%;">
+			<noFound :nodata="pageList.length > 0 ? false : true" />
+		</view>
+		<view class="load-more" v-if="pageList.length > 0">
+			<text>{{ !pageData.isEnd ? '正在加载,请稍后...' : '——— 我是有底线的 ———' }}</text>
+		</view>
+		<!-- 	</scroll-view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+import ListUnit from './components/businessUnit.vue'
+
+export default {
+	data() {
+		return {
+			pageData: {
+				pageIndex: 1,
+				pageSize: 10,
+				isEnd: false,
+				isLoading: true
+			},
+			pageList: []
+		}
+	},
+	components: {
+		ListUnit
+	},
+
+	computed: {
+		...mapGetters({
+			reloading: 'shouldReLoadingList',
+			users: 'getUser'
+		})
+	},
+	methods: {
+		...mapMutations(['shouldReLoadingList']),
+		getList() {
+			let _this = this
+
+			let req = {
+				SearchParameter: {
+					Accept_Code: "",
+					BusinessProcess_StateSearch: "",
+					Operation_Type: 6,
+					UserId: this.users.UserId
+				},
+				PageIndex: _this.pageData.pageIndex,
+				PageSize: _this.pageData.pageSize,
+			}
+
+			console.log('reqreqreqreq', req);
+
+
+			this.$request.$webPost('EShangApiMain/BusinessProcess/GetBusinessProcessList', req).then(res => {
+				console.log('resada', res);
+				if (res.Result_Code === 100) {
+					let list = res.Result_Data.List
+					if (list.length > 0) {
+						_this.pageList = this.pageData.pageIndex == 1 ? list : [..._this.pageList, ...list]
+					}
+					if (list.length < _this.pageData.pageSize) { // 返回条数小于每页条数
+						_this.pageData.isEnd = true
+					}
+					_this.$forceUpdate()
+				} else {
+					_this.pageList = []
+				}
+				uni.hideLoading()
+				setTimeout(function () {
+					_this.pageData.isLoading = false
+				}, 500)
+			})
+
+			// _this.$request.$get("GetCommdityFlowList",{
+			// 	pageIndex: _this.pageData.pageIndex,
+			// 	pageSize: _this.pageData.pageSize
+			// }).then(res => {
+			// 	if(!res.ResultCode ||res.ResultCode!='100'){
+			// 		_this.pageList = []
+			// 	}else{
+			// 		let list = res.Data.List
+			// 		if (list.length > 0) {
+			// 			_this.pageList = this.pageData.pageIndex==1 ? list : [..._this.pageList,...list]
+			// 		}
+			// 		if (list.length < _this.pageData.pageSize) { // 返回条数小于每页条数
+			// 			_this.pageData.isEnd = true
+			// 		}
+			// 		_this.$forceUpdate()
+			// 	}
+			// })
+		},
+		loadMore() {
+			if (!this.pageData.isEnd) {
+				this.pageData.pageIndex += 1
+				this.getList()
+			}
+		},
+		goDetail(item) {
+			let pageName = ''
+			this.$util.toNextRoute('navigateTo', "/pages/businessApproval/productDetail?id=" + item.HIGHWAYPROINST_ID)
+
+		},
+	},
+	onPullDownRefresh() {
+		this.pageData.pageIndex = 1
+		this.pageData.isEnd = false
+		uni.showLoading({
+			title: '正在加载'
+		})
+		this.getList()
+		setTimeout(function () {
+			uni.stopPullDownRefresh()
+		}, 1000)
+	},
+	onReachBottom() {
+		this.loadMore()
+	},
+	onShow() {
+		let _this = this
+		if (this.reloading) {
+			uni.showLoading({
+				title: '正在加载'
+			})
+			_this.pageData.pageIndex = 1
+			_this.pageData.isEnd = false
+			_this.getList()
+			this.shouldReLoadingList(false)
+		}
+
+	},
+	onLoad() {
+		this.pageData.isLoading = true
+		uni.showLoading({
+			title: '正在加载'
+		})
+		this.getList()
+	},
+	onUnload() {
+		this.$util.addUserBehaviorNew()
+	},
+	onHide() {
+
+	}
+}
+</script>
+
+<style scoped>
+.content {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	/* height: 100%; */
+}
+</style>
diff --git a/pages/ProductReview/components/businessUnit.vue b/pages/ProductReview/components/businessUnit.vue
new file mode 100644
index 0000000..823cf18
--- /dev/null
+++ b/pages/ProductReview/components/businessUnit.vue
@@ -0,0 +1,89 @@
+<template>
+	<div class="card" :class="item.SORTNUM == 0 ? 'conten-border' : ''" @tap='goDetail' v-if="item">
+		<div class="uni-flex jc-between" >
+			<p class="contentName">
+				{{item.SERVERPART_NAME}}
+			<!-- 	<span v-if="item.HIGHWAYPROINST_NEXTID=='3000'" style="color:#D73535;">【退】</span>
+				<span v-else-if="item.HIGHWAYPROINST_NEXTID=='4000'" style="color:#D73535;">【移】</span> -->
+			</p>
+			<text class="typeText" :class="item.HIGHWAYPROINST_NEXTID=='9000' ? 'typeText-color' : ''">{{item.SORTNUM==0 ? '待我处理': proStatus[item.HIGHWAYPROINST_NEXTID]}}</text>
+		</div>
+		<div class="content-index">{{i+1}}</div>
+		<view style="line-height: 1;" class="content-type-text">
+			{{item.PROINST_NAME}}
+		</view>
+		<view class="content-box-cashpay">
+			<text >{{item.PRODEF_NAME }}</text>
+
+		</view>
+		<view class="bb1"></view>
+		<view class="uni-flex align-center jc-between" v-if="item.ACTINST_NAME">
+
+			<view class="uni-flex jc-top" >
+				<i class="B-icon A-icon"></i>
+				<text class="content-span">{{item.ACTINST_NAME}}</text>
+			</view>
+			<text class="content-span" v-if="!item.STAFF_NAME">{{item.HIGHWAYPROINST_CREATEDATE}}</text>
+		</view>
+		<view class="uni-flex jc-between" v-if="item.STAFF_NAME">
+			<view class="uni-flex align-top" >
+				<text class="G-icon A-icon" ></text>
+				<text class="content-span staff-text">{{item.STAFF_NAME}}</text>
+			</view>
+			<text class="content-span lh15">{{item.HIGHWAYPROINST_CREATEDATE}}</text>
+		</view>
+		<view class="uni-flex jc-end"  v-if="!item.ACTINST_NAME && !item.STAFF_NAME">
+
+			<text class="content-span">{{item.HIGHWAYPROINST_CREATEDATE}}</text>
+		</view>
+	</div>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {
+				type: Object,
+				required: true
+			},
+			i: {
+				type: Number,
+				required: true
+			}
+		},
+		data () {
+			return {
+				proStatus: {
+					1000: '待受理',
+					2000: '办理中',
+					3000: '已驳回',
+					4000: '已移交',
+					9000: '已审结'
+				}
+			}
+		},
+		computed: {
+		},
+		methods: {
+			goDetail () {
+				this.$emit('goDetail', this.item)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@import url('../../../common/css/listUnit.css');
+	.content-box-cashpay {
+		margin-top: 40rpx;
+		font-size: 24rpx;
+		text-align: center;
+		padding-bottom: 16rpx;
+	}
+	.content-box-cashpay text {
+		font-size: 30rpx;
+		font-weight: 600;
+		line-height: 1.5;
+	}
+
+</style>
diff --git a/pages/ProductReview/components/newBusinessUnit.vue b/pages/ProductReview/components/newBusinessUnit.vue
new file mode 100644
index 0000000..7a2fd0c
--- /dev/null
+++ b/pages/ProductReview/components/newBusinessUnit.vue
@@ -0,0 +1,88 @@
+<template>
+    <div class="card" :class="item.SORTNUM == 0 ? 'conten-border' : ''" @tap='goDetail' v-if="item">
+        <div class="uni-flex jc-between" >
+            <p class="contentName">
+                {{item.Serverpart_Name}}
+                <!-- 	<span v-if="item.HIGHWAYPROINST_NEXTID=='3000'" style="color:#D73535;">【退】</span>
+                  <span v-else-if="item.HIGHWAYPROINST_NEXTID=='4000'" style="color:#D73535;">【移】</span> -->
+            </p>
+            <text class="typeText" :class="item.BusinessProcess_State=='9000' ? 'typeText-color' : ''">{{proStatus[item.BusinessProcess_State]}}</text>
+        </div>
+        <div class="content-index">{{i+1}}</div>
+<!--        <view style="line-height: 1;" class="content-type-text">-->
+<!--            {{item.PROINST_NAME}}1-->
+<!--        </view>-->
+        <view class="content-box-cashpay">
+            <text >{{item.BusinessProcess_Name}}</text>
+
+        </view>
+        <view class="bb1"></view>
+        <view class="uni-flex align-center jc-between" v-if="item.ACTINST_NAME">
+
+            <view class="uni-flex jc-top" >
+                <i class="B-icon A-icon"></i>
+                <text class="content-span">{{item.ACTINST_NAME}}2</text>
+            </view>
+            <text class="content-span" v-if="!item.STAFF_NAME">3{{item.HIGHWAYPROINST_CREATEDATE}}</text>
+        </view>
+        <view class="uni-flex jc-between" v-if="item.Staff_Name">
+            <view class="uni-flex align-top" >
+                <text class="G-icon A-icon" ></text>
+                <text class="content-span staff-text">{{item.Staff_Name}}</text>
+            </view>
+<!--            <text class="content-span lh15">5{{item.HIGHWAYPROINST_CREATEDATE}}</text>-->
+            <view class="uni-flex jc-end"  v-if="!item.ACTINST_NAME && !item.STAFF_NAME">
+                <text class="content-span">{{item.BusinessProcess_StartDate}}</text>
+            </view>
+        </view>
+
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        item: {
+            type: Object,
+            required: true
+        },
+        i: {
+            type: Number,
+            required: true
+        }
+    },
+    data () {
+        return {
+            proStatus: {
+                2000: '待我处理',
+                3000: '待我处理',
+                9000: '已审结',
+                9999: '已否决',
+            }
+        }
+    },
+    computed: {
+    },
+    methods: {
+        goDetail () {
+            this.$emit('goDetail', this.item)
+        }
+    }
+}
+</script>
+
+<style scoped>
+@import url('../../../common/css/listUnit.css');
+.content-box-cashpay {
+    margin-top: 40rpx;
+    font-size: 24rpx;
+    text-align: center;
+    padding-bottom: 16rpx;
+}
+.content-box-cashpay text {
+    font-size: 30rpx;
+    font-weight: 600;
+    line-height: 1.5;
+}
+
+</style>
diff --git a/pages/ProductReview/newApproval.vue b/pages/ProductReview/newApproval.vue
new file mode 100644
index 0000000..6a1548d
--- /dev/null
+++ b/pages/ProductReview/newApproval.vue
@@ -0,0 +1,147 @@
+<template>
+    <view class="content">
+        <!-- 	<view style="flex: 1;overflow: hidden;" >
+          <scroll-view scroll-y="true" style="height: 100%;width: 100%;" @scrolltolower="loadMore"> -->
+        <view v-if="pageList.length>0">
+            <list-unit v-for="(item,index) in pageList" :key="index" :item="item" :i="index" @goDetail="goDetail"></list-unit>
+        </view>
+        <view v-else-if="!pageData.isLoading" style="height: 100%;">
+            <noFound :nodata="pageList.length>0 ? false : true"/>
+        </view>
+        <view class="load-more" v-if="pageList.length>0">
+            <text>{{!pageData.isEnd ? '正在加载,请稍后...':'——— 我是有底线的 ———'}}</text>
+        </view>
+        <!-- 	</scroll-view>
+        </view> -->
+    </view>
+</template>
+
+<script>
+import {mapGetters,mapMutations} from 'vuex'
+import ListUnit from './components/newBusinessUnit.vue'
+
+export default {
+  data() {
+    return {
+      pageData: {
+        pageIndex:1,
+        pageSize:10,
+        isEnd: false,
+        isLoading: true,
+        list:[]
+      },
+      pageList:[]
+    }
+  },
+  components:{
+    ListUnit
+  },
+
+  computed:{
+    ...mapGetters({reloading:'shouldReLoadingList'})
+  },
+  methods: {
+    ...mapMutations(['shouldReLoadingList']),
+    loadMore(){
+      if(!this.pageData.isEnd) {
+        this.pageData.pageIndex += 1
+        this.getData()
+      }
+    },
+    goDetail(item) {
+      let pageName = ''
+      this.$util.toNextRoute('navigateTo', "/pages/businessApproval/newDetail?id=" + item.BusinessProcess_ID)
+    },
+      getData() {
+          let _this = this
+          this.$request.$webPost('EShangApiMain/BusinessProcess/GetBusinessProcessList', {
+              QueryType:"0",
+              SearchParameter:{
+                  Operation_Type: "10",
+                  BusinessProcess_StateSearch: "2000,2010,2020,2030,2040,2050,2060,2070,2080,2090,3000,9000,9999",
+              },
+              ShowWholePower: true,
+              PageIndex:this.pageData.pageIndex,
+              PageSize: 10,
+              SortStr:'BUSINESSAPPROVAL_STATE,BUSINESS_STARTDATE desc'
+              // SortStr: 'BusinessProcess_State,BusinessProcess_StartDate desc'
+          }).then(res => {
+              console.log('res',res)
+              if(!res.Result_Code ||res.Result_Code!='100'){
+                  _this.pageList = []
+              }else{
+                  let list = res.Result_Data.List
+                  if (list.length > 0) {
+                      _this.pageList = this.pageData.pageIndex==1 ? list : [..._this.pageList,...list]
+                  }
+                  if (list.length < _this.pageData.pageSize) { // 返回条数小于每页条数
+                      _this.pageData.isEnd = true
+                  }
+                  _this.$forceUpdate()
+
+              }
+              uni.hideLoading()
+              setTimeout(function(){
+                  _this.pageData.isLoading = false
+              },500)
+          })
+      },
+
+  },
+  onPullDownRefresh() {
+    this.pageData.pageIndex = 1
+    this.pageData.isEnd = false
+    uni.showLoading({
+      title:'正在加载'
+    })
+    this.getData()
+    setTimeout(function() {
+      uni.stopPullDownRefresh()
+    }, 1000)
+  },
+  onReachBottom(){
+    this.loadMore()
+  },
+  onShow() {
+    let _this = this
+    if(this.reloading) {
+      uni.showLoading({
+        title:'正在加载'
+      })
+      _this.pageData.pageIndex = 1
+      _this.pageData.isEnd = false
+      // _this.getData()
+      console.log('onShow')
+      _this.getData()
+      this.shouldReLoadingList(false)
+    }else{
+      console.log('onShow')
+      _this.getData()
+    }
+  },
+  onLoad() {
+    this.pageData.isLoading= true
+    uni.showLoading({
+      title:'正在加载'
+    })
+    // this.getData()
+      this.getData()
+  },
+  onUnload() {
+    this.$util.addUserBehaviorNew()
+  },
+  onHide() {
+
+  }
+}
+</script>
+
+<style scoped>
+.content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  /* height: 100%; */
+}
+
+</style>
diff --git a/pages/ProductReview/newDetail.vue b/pages/ProductReview/newDetail.vue
new file mode 100644
index 0000000..b16f7da
--- /dev/null
+++ b/pages/ProductReview/newDetail.vue
@@ -0,0 +1,1076 @@
+<template>
+  <view>
+    <view class="base-info pb20">
+      <view class="content-title">{{baseData.BUSINESSPROCESS_NAME}}</view>
+      <view class="main-card">
+        <div class="card-title">
+          <h4>{{baseData.SERVERPART_NAME}}</h4>
+          <div class="card-status" :style="baseData.BUSINESSAPPROVAL_STATE!=9000 ?'color:#df7f42;':''">
+            {{proStatus[baseData.BUSINESSAPPROVAL_STATE]||''}}</div>
+        </div>
+        <div class="base-body" style="align-items: center;">
+          <i class="ico ico-user"></i><span class="item-title">申请人：</span><text>{{baseData.STAFF_NAME}}</text>
+        </div>
+        <div class="base-body" style="align-items: center;">
+          <i class="ico ico-sjx"></i><span class="item-title">创建日期：
+					</span><text>{{baseData.BUSINESS_STARTDATE}}</text>
+        </div>
+        <div class="base-body">
+          <view class="uni-flex" style="align-items: center;">
+            <i class="ico ico-bz"></i><span class="item-title">业务说明： </span>
+
+          </view>
+
+          <text>{{baseData.BUSINESSAPPROVAL_DESC}}</text>
+        </div>
+      </view>
+
+
+      <view class="button-box" >
+<!--        -->
+        <span @tap="showPop(2000)" v-if="baseData.BUSINESSAPPROVAL_STATE<9000">
+					<image src="/static/images/sh-btn.png" mode="aspectFit"></image> 审核
+				</span>
+<!--        -->
+        <span @tap="showPop(3000)" v-if="baseData.BUSINESSAPPROVAL_STATE<9000">
+					<image src="/static/images/bh-btn.png" mode="aspectFit"></image> 驳回
+				</span>
+      </view>
+
+    </view>
+    <view class="base-info mt20" v-if="baseData.RejectApproved && baseData.RejectApproved.length>0">
+      <div class="uni-list-cell uni-collapse">
+        <div class="cat-box uni-list-cell-navigate">
+          <b>驳回意见</b>
+        </div>
+        <div class="process-box uni-collapse-content uni-active">
+          <processUnit :item="baseData.RejectApproved[0]" :approveType="0" />
+        </div>
+      </div>
+    </view>
+    <view class="base-info">
+      <div class="uni-list-cell uni-collapse">
+        <div class="cat-box uni-list-cell-navigate"
+             :class="cardShow ? ' uni-navigate-bottom' : 'uni-navigate-right'" @click="handleChangeCardShow">
+          <b>审批流程</b>
+        </div>
+<!--        <div class="process-box uni-collapse-content" :class="cardShow ? 'uni-active' : ''" v-show="cardShow">-->
+<!--          <processUnit v-for="item in baseData.ApproveList" :item="item" :key="item.APPROVED_ID"-->
+<!--                       :approveType="1" />-->
+<!--        </div>-->
+          <view class="approveBox" v-if="cardShow">
+              <view class="approveItem" v-for="(item,index) in approveMessageList" :key="index">
+                  <view class="approve">
+                      <view class="approveLeft">
+<!--                          <i class="ico" :class=" { 'ico-bh': item.APPLYAPPROVE_TYPE===9999,'ico-tg':item.APPLYAPPROVE_TYPE===9000}"/>-->
+                        <image class="typeIcon" :src="item.APPLYAPPROVE_TYPE<=9000?'/static/images/right-ico.png':item.APPLYAPPROVE_TYPE===9999?'/static/images/wrong-ico.png':''"/>
+                          <text class="approveName">【{{item.APPLYAPPROVE_NAME}}】</text>
+                      </view>
+                      <text class="appDate">{{item.APPLYAPPROVE_DATE}}</text>
+                  </view>
+                  <view class="approveBottom">
+                      <view class="bottomLeft">
+                          <text class="leftLabel">{{item.STAFF_NAME}}</text>
+                      </view>
+
+                      <view class="bottomRight">
+                          <text class="rightLabel">{{item.APPLYAPPROVE_INFO}}</text>
+                      </view>
+                  </view>
+              </view>
+          </view>
+      </div>
+    </view>
+
+      <view class="page-title">{{baseData.ACCEPT_CODE == 100100 ? '商品新增' : '信息修改'}}详情</view>
+
+      <view class="bigBox">
+          <view class="pageTitleBox" v-if="WarehouseDetailList.WAREHOUSE_NAME">
+              <view class="top" @click="handleChangeManager">
+                  <view :class="showManager?'pageTitleBottom':'pageTitleRight'">管理处：</view>
+                  <view class="bottom">{{WarehouseDetailList.WAREHOUSE_NAME}}</view>
+              </view>
+          </view>
+          <view class="pageList" v-if="showManager">
+              <div class="pageItem" v-for="(item,index) in WarehouseDetailList.DetailList" :key="index">
+                  <div class="box">
+                      <view class="top">
+                          <text class="topTitle">{{item.COMMODITYTYPE_NAME}}</text>
+                      </view>
+                      <view class="headerBox">
+                          <view class="shopName">{{item.COMMODITY_NAME}}</view>
+                          <view class="shopPrice">售价：<text class="shopMoney">￥{{item.COMMODITY_SELLPRICE}}</text></view>
+                      </view>
+                      <view class="detailBox">
+                          <view class="leftDetail">
+                              <image class="code" src="../../static/images/txm_logo.png"/>
+                              <text class="codeNumber">{{item.COMMODITY_BARCODE}}</text>
+                          </view>
+                          <view class="rightDetail">
+                              <text class="ruleText">{{item.COMMODITY_RULE}}</text>
+                              <text v-if="item.COMMODITY_RULE_ORI " class="ruleText" style="text-decoration: line-through;color: #cbcbcb">{{item.COMMODITY_RULE_ORI}}</text>
+                              <text class="typeName" style="margin-left: 8rpx">{{item.COMMODITY_STATE===1?'有效':'无效'}}</text>
+                          </view>
+                      </view>
+                  </div>
+                  <div class="bottom" style="display: flex">
+<!--                      <text v-if="item.COMMODITY_SELLPRICE_ORI">折扣前：-->
+<!--                          <text class="priceBefore">￥{{item.COMMODITY_SELLPRICE}}</text>-->
+<!--                          <text style="text-decoration: line-through;color: #cbcbcb">￥{{item.COMMODITY_SELLPRICE_ORI}}</text>-->
+<!--                        <b class="uni-icon"-->
+<!--                           :class="(item.COMMODITY_SELLPRICE_ORI < item.COMMODITY_SELLPRICE) ?'uni-icon-arrowthinup': ' uni-icon-arrowthindown'"></b>-->
+<!--                      </text>-->
+                      <view style="display: inline-block;width: 50%">折扣前：
+                        <text class="priceBefore">￥{{item.COMMODITY_SELLPRICE }}</text>
+                        <text v-if="item.COMMODITY_SELLPRICE_ORI" style="text-decoration: line-through;color: #cbcbcb">￥{{item.COMMODITY_SELLPRICE_ORI }}</text>
+                        <b v-if="item.COMMODITY_SELLPRICE_ORI && item.COMMODITY_SELLPRICE"
+                            class="uni-icon"
+                           :class="(item.COMMODITY_SELLPRICE_ORI < item.COMMODITY_SELLPRICE) ?'uni-icon-arrowthinup': ' uni-icon-arrowthindown'"></b>
+                      </view>
+                      <view style="display: inline-block;width: 50%">折扣后：
+                        <text class="priceBefore">￥{{item.COMMODITY_PURCHASEPRICE }}</text>
+                        <text v-if="item.COMMODITY_PURCHASEPRICE_ORI" style="text-decoration: line-through;color: #cbcbcb">￥{{item.COMMODITY_PURCHASEPRICE_ORI }}</text>
+                        <b v-if="item.COMMODITY_PURCHASEPRICE_ORI && item.COMMODITY_PURCHASEPRICE"
+                            class="uni-icon"
+                           :class="(item.COMMODITY_PURCHASEPRICE_ORI < item.COMMODITY_PURCHASEPRICE) ?'uni-icon-arrowthinup': ' uni-icon-arrowthindown'"></b>
+                      </view>
+                  </div>
+              </div>
+          </view>
+
+          <view class="pageTitleBox" v-if="serverShopList.WAREHOUSE_NAME">
+              <view class="top" @click="handleChangeShowService">
+                  <view :class="showService?'pageTitleBottom':'pageTitleRight'">服务区：</view>
+                  <view class="bottom">{{serverShopList.WAREHOUSE_NAME}}</view>
+              </view>
+          </view>
+          <view class="pageList" v-if="showService">
+              <div class="pageItem" v-for="(item,index) in serverShopList.DetailList.slice(0,showPage*20)" :key="index">
+                  <div class="box">
+                      <view class="top">
+                          <text class="topTitle">{{item.COMMODITYTYPE_NAME}}</text>
+                      </view>
+                      <view class="headerBox">
+                          <text  class="shopName">{{item.COMMODITY_NAME}}</text>
+                          <text  class="shopPrice">售价：<text class="shopMoney">￥{{item.COMMODITY_SELLPRICE }}</text></text>
+                      </view>
+                      <view class="detailBox">
+                          <view class="leftDetail">
+                              <image class="code" src="../../static/images/txm_logo.png"/>
+                              <text class="codeNumber">{{item.COMMODITY_BARCODE}}</text>
+                          </view>
+                          <view class="rightDetail">
+                            <text class="ruleText">{{item.COMMODITY_RULE}}</text>
+                            <text v-if="item.COMMODITY_RULE_ORI " class="ruleText" style="text-decoration: line-through;color: #cbcbcb">{{item.COMMODITY_RULE_ORI}}</text>
+                              <text  class="typeName" style="margin-left: 8rpx">{{item.COMMODITY_STATE===1?'有效':'无效'}}</text>
+                          </view>
+                      </view>
+                  </div>
+                  <div class="bottom" v-if="item.COMMODITY_SELLPRICE">
+                      <view v-if="item.COMMODITY_SELLPRICE_ORI">售价：
+                          <text class="priceBefore">￥{{item.COMMODITY_SELLPRICE }}</text>
+                          <text style="text-decoration: line-through;color: #cbcbcb">￥{{item.COMMODITY_SELLPRICE_ORI}}</text>
+                        <b  v-if="item.COMMODITY_SELLPRICE_ORI && item.COMMODITY_SELLPRICE"
+                            class="uni-icon"
+                           :class="(item.COMMODITY_SELLPRICE_ORI < item.COMMODITY_SELLPRICE) ?'uni-icon-arrowthinup': ' uni-icon-arrowthindown'"></b>
+                      </view>
+                      <!--                  <text v-else>售价：<text class="priceBefore">￥{{item.COMMODITY_SELLPRICE}}</text></text>-->
+                      <!--                  <text>折扣后：<text class="priceAfter">￥{{item.COMMODITY_PURCHASEPRICE}}</text></text>-->
+                  </div>
+              </div>
+            <view class="load-more" v-if="serverShopList.DetailList && serverShopList.DetailList.length>showPage*20">
+              <text @click="handleGetMore">{{'点击加载更多'}}</text>
+            </view>
+          </view>
+      </view>
+
+      <div class="opinion2" v-show="showOptionBox">
+          <div>
+              <p class="opinion2-title"><span>{{isback? '驳回':'确认'}}意见</span></p>
+              <textarea v-model="PURCHASEDESC" :placeholder="'请填写'+(isback? '驳回':'确认')+'意见'" class="text-content check-reason" />
+          </div>
+          <div class="check-btn-box">
+              <div class="check-btn no-check" @click="handleCloseShow(false)">取消</div>
+              <div class="check-btn" @click="handleCloseShow(true)">确定</div>
+          </div>
+      </div>
+      <div v-show="showOptionBox" class="shenhe-mask" @click.stop="maskFn()"></div>
+
+  </view>
+</template>
+
+<script>
+const json = {
+  COMMODITY_NAME: '品名',
+  COMMODITY_BARCODE: '条码',
+  COMMODITYTYPE_NAME: '类别',
+  COMMODITY_UNIT: '单位',
+  COMMODITY_RULE: '规格',
+  COMMODITY_STATE_NAME: '状态',
+  COMMODITY_ORI: '产地',
+  COMMODITY_RETAILPRICE: '售价',
+  COMMODITY_PURCHASEPRICE: '进价',
+  BUSINESSTYPE_NAME: '业态',
+  COMMODITY_GRADE_NAME: '质量等级',
+  ISBULK_NAME: '是否散装',
+  METERINGMETHOD_NAME: '称重方式',
+}
+
+import {
+  mapGetters, mapState
+} from 'vuex'
+import processUnit from '@/components/auditingProcess/item.vue'
+import filesUnit from '@/components/filesComponent/fileUnit.vue'
+
+export default {
+
+  components: {
+    filesUnit,
+    processUnit
+  },
+  computed: {
+    ...mapGetters({
+      'users': 'getUser'
+    }),
+    ...mapState({
+      user: (state)=>{
+        return {
+          UserId: state.userData.UserId,
+          UserName: state.userData.UserName,
+          Membership_Phone: state.userData.Membership_Phone,
+          Membership_Id: state.userData.Membership_Id,
+          Membership_Type: state.userData.Membership_Type
+        }
+      },
+      toDoMsg: (state)=>{
+        return state.toDoMsg
+      },
+      menus: (state)=> {
+        return state.userData.AuthorityInfo
+      }
+    }),
+  },
+  data() {
+
+    return {
+      baseData: {},
+      pageData: [],
+      changeList: [],
+      cateArr: [],
+      cardShowMap: {},
+      commodityTree: {},
+      cardShow: true,
+      doUser: false,
+      proStatus: {
+          2000: '待我处理',
+          3000: '待我处理',
+          9000: '已审结',
+          9999: '已否决',
+      },
+      serverShopList:{
+          WAREHOUSE_NAME:'',
+          DetailList:''
+      },
+        WarehouseDetailList:{
+            WAREHOUSE_NAME:'',
+            DetailList:''
+        },
+        showManager:false,
+        showService:false,
+        approveMessageList:[],
+        showOptionBox:false,
+        isback:'',
+        PURCHASEDESC:'',
+      showPage:1,// 显示页数
+    }
+  },
+  methods: {
+    isShowCate(item) {
+
+      this.cardShowMap[item.id] = !this.cardShowMap[item.id]
+    },
+    getYes(val) {
+      return val === 1 ? '是 ' : '否'
+    },
+    handleGetMore(){
+      this.showPage = this.showPage+1
+    },
+    handleChangeCardShow(){
+      this.cardShow = !this.cardShow
+    },
+    maskFn(){
+    },
+    handleCloseShow(type){
+      console.log('user',this.users)
+      console.log('baseData',this.baseData)
+      let _this = this
+      if (type){
+        if (this.isback){
+          if (!_this.PURCHASEDESC){
+            uni.showModal({
+              title:'请输入驳回意见',
+              showCancel:false
+            })
+            return
+          }
+          uni.showModal({
+            title:'提示',
+            content:'确认否决该申请？',
+            success:function (res){
+              if (res.confirm){
+                _this.$request.$webGet('EShangApiMain/Seller/RejectUniformProinst',{
+                  businessApprovalID:_this.baseData.BUSINESSAPPROVAL_ID,
+                  approveedStaffId:_this.users.UserId,
+                  approveedStaffName:_this.users.UserName,
+                  approveedInfo: _this.PURCHASEDESC
+                }).then(()=>{
+                  uni.hideLoading()
+                  uni.showToast({
+                    title:res.Result_Desc,
+                    icon:'none'
+                  })
+                  setTimeout(()=>{
+                    _this.handleBack()
+                  },500)
+                })
+              }
+            }
+          })
+        }else{
+          // 提交审批
+          uni.showModal({
+            title:'提示',
+            content:'确认同意该申请？',
+            success:function (res){
+              console.log('res',res)
+              if(res.confirm){
+                uni.showLoading({
+                  title:'正在加载'
+                })
+                _this.$request.$webGet('EShangApiMain/Seller/ApproveUniformProinst',{
+                  businessApprovalID:_this.baseData.BUSINESSAPPROVAL_ID,
+                  //
+                  curProinstState:_this.baseData.BUSINESSAPPROVAL_STATE,
+                  approveedStaffId:_this.users.UserId,
+                  approveedStaffName:_this.users.UserName,
+                  approveedInfo: _this.PURCHASEDESC
+                }).then((rs)=>{
+                  uni.hideLoading()
+                  uni.showToast({
+                    title:rs.Result_Desc,
+                    icon:'none'
+                  })
+                  setTimeout(()=>{
+                    _this.handleBack()
+                  },500)
+                })
+              }
+            }
+          })
+        }
+
+      }else{
+        this.showOptionBox = false
+      }
+
+    },
+    handleBack(){
+      uni.redirectTo({
+        url: '/pages/businessApproval/newApproval'
+      });
+    },
+    showPop(type) {
+        if (type===2000){
+            this.isback = false
+        }else{
+            this.isback = true
+        }
+        this.showOptionBox = true
+
+      // let _this = this
+      // let url = ''
+      // switch (type) {
+      //   case 4000:
+      //     url = '/pages/auditingPop/transfer?businessType=2000&PROINST_ID=' + _this.baseData
+      //         .HIGHWAYPROINST_ID + '&NOWACTINST_ID=' + _this.baseData.NOWACTINST_ID
+      //     break;
+      //   case 2000:
+      //     url = '/pages/auditingPop/toExamine?businessType=2000&PROINST_ID=' + _this.baseData
+      //         .HIGHWAYPROINST_ID + '&NOWACTINST_ID=' + _this.baseData.NOWACTINST_ID + '&ApproName=' + _this
+      //         .baseData.ACTINST_NAME + '&NeedApproved=1'
+      //     break;
+      //   case 3000:
+      //     url = '/pages/auditingPop/reject?businessType=2000&PROINST_ID=' + _this.baseData
+      //         .HIGHWAYPROINST_ID + '&NOWACTINST_ID=' + _this.baseData.NOWACTINST_ID
+      //     break;
+      // }
+      // this.$util.toNextRoute('navigateTo', url)
+    },
+      handleChangeManager(){
+        console.log('1')
+        this.showManager = !this.showManager
+      },
+      handleChangeShowService(){
+        console.log('2',this.serverShopList.DetailList)
+        this.showService = !this.showService
+        console.log('this.showService',this.showService)
+      },
+    getDetail(id) {
+      let _this = this
+      // _this.$request.$get("GetCommodityFlowDetail", {
+      //   HIGHWAYPROINST_ID: id
+      // }).
+        this.$request.$webGet('EShangApiMain/Seller/GetUniformProinstDetail', {
+            businessApprovalID: id
+        }).then(rs => {
+        console.log('rs',rs)
+        if (!rs.Result_Code || rs.Result_Code != '100') {
+          _this.isShow = false
+        } else {
+          _this.isShow = true
+        }
+
+        uni.hideLoading()
+        let _data = rs.Result_Data
+        _this.baseData = _data.businessApprovalModel
+        console.log('_this.baseData',_this.baseData)
+        _this.serverShopList = _data.ServerpartDetail
+        console.log('_this.baseData',_this.baseData)
+            _this.approveMessageList = _data.APPLYAPPROVEList
+            _this.WarehouseDetailList = _data.WarehouseDetail
+            // 解析附件信息
+        if (_data.FileList) {
+          _data.FileList.map(v => {
+            let name = v.ATTACHMENT_URL.split('.')
+            v.type = name[name.length - 1]
+            v.name = v.ATTACHMENT_DESC
+            v.path = v.ATTACHMENT_URL
+          })
+        }
+        // 解析资质文件信息
+        if (_data.QualificationList) {
+          _data.QualificationList.map(v => {
+            let name = v.IMAGE_URL.split('.')
+            v.type = name[name.length - 1]
+            v.name = v.IMAGE_TITLE
+            v.path = v.IMAGE_URL
+          })
+        }
+        _this.getChange()
+        _this.$forceUpdate()
+      })
+    },
+    getChange() { // 获取调整过的商品参数
+      let _this = this
+      let itemName = Object.keys(json) // 数据名称
+      let changeItem = {} //
+      let map = {}
+      let cateArr = []
+      let cardShowMap = {}
+
+      _this.baseData.CommodityList.forEach(item => {
+
+        if (!map[item.COMMODITY_TYPE]) {
+          map[item.COMMODITY_TYPE] = []
+          cardShowMap[item.COMMODITY_TYPE] = true
+          cateArr.push({
+            id: item.COMMODITY_TYPE,
+            name: item.COMMODITYTYPE_NAME,
+            child: map[item.COMMODITY_TYPE]
+          })
+
+        }
+
+        map[item.COMMODITY_TYPE].push(item)
+        itemName.forEach(el => {
+          let fName = 'F_' + el
+
+          // item[el] 现参数值 item[fName] 原参数值
+          if (item[fName] && item[el] !== item[fName]) {
+
+            if (!changeItem[item.COMMODITY_ID]) {
+              changeItem[item.COMMODITY_ID] = []
+            }
+            let originValue = item[fName]
+            let nowValue = item[el]
+            let arr = {
+              changeName: json[el],
+              org: originValue,
+              nowV: nowValue,
+              isprice: false
+            }
+            if (json[el].indexOf('价') > -1) {
+              arr.org = _this.$util.fmoney(originValue, 2)
+              arr.nowV = _this.$util.fmoney(nowValue, 2)
+              arr.isprice = true
+            }
+            changeItem[item.COMMODITY_ID].push(arr)
+          }
+        })
+      })
+      _this.changeList = changeItem
+      // _this.commodityTree = map
+      _this.cateArr = cateArr
+      _this.cardShowMap = cardShowMap
+
+    }
+
+  },
+  onLoad(option) {
+    let _this = this
+    uni.showLoading({
+      title: '正在加载'
+    })
+    this.getDetail(option.id)
+
+    uni.$on('2000', function(data) {
+      if (data) {
+        uni.showLoading({
+          title: '正在加载'
+        })
+        _this.pageData.pageIndex = 1
+        _this.pageData.isEnd = false
+        _this.getDetail(_this.baseData.HIGHWAYPROINST_ID)
+
+      }
+    });
+  },
+  onUnload() {
+    this.$util.addUserBehaviorNew()
+    uni.$off('2000');
+  },
+  onShow() {
+
+  },
+  onHide() {
+
+  }
+}
+</script>
+
+<style scoped>
+.mt20 {
+  margin-top: 10upx;
+}
+
+.uni-icon {
+  font-size: 28upx;
+  font-weight: bold;
+}
+
+.uni-text-gray {
+  font-size: 24upx;
+}
+
+.uni-icon-arrowthindown {
+  color: #50b045;
+}
+
+.uni-icon-arrowthinup {
+  color: #ff4952;
+}
+
+.no-show {
+  display: none;
+}
+
+.pb20 {
+  padding-bottom: 40upx;
+}
+
+.pb8 {
+  padding-bottom: 8upx;
+}
+
+.lh28 {
+  line-height: 54upx;
+}
+
+.file-body {
+  padding: 12rpx 26rpx;
+}
+
+.imgBox {
+  padding: 0 28rpx;
+}
+
+.base-info {
+  background-color: #fff;
+}
+
+.base-info+.base-info {
+  margin-top: 20upx;
+}
+
+.content-title {
+  height: 115upx;
+  line-height: 115upx;
+  text-align: center;
+  position: relative;
+}
+
+.main-card {
+  /* border: 1upx solid #ddd; */
+  border-radius: 6upx;
+  box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.1);
+  margin-left: 24upx;
+  margin-right: 24upx;
+  margin-top: 2rpx;
+}
+
+.main-card+.main-card {
+  margin-top: 20upx;
+}
+
+.uni-collapse-content .main-card:nth-last-child(1) {
+  margin-bottom: 40upx;
+
+}
+
+.card-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.card-title h4 {
+  padding: 20upx 0 15upx 20upx;
+}
+
+.card-status {
+  font-size: 22upx;
+  color: #999;
+  padding-right: 16upx;
+}
+
+.base-body {
+  font-size: 24upx;
+  display: flex;
+  justify-content: flex-start;
+  padding: 15upx 20upx;
+  align-items: flex-start;
+}
+
+.item-title {
+  color: #777;
+  width: 120upx;
+  /* text-align: justify; */
+  height: 40upx;
+  font-size: 24upx;
+  /* white-space: nowrap; */
+}
+
+.item-title:after {
+  display: inline-block;
+  content: '';
+  padding-left: 100%;
+}
+
+.base-body+.base-body {
+  border-top: 1upx dashed #eee;
+}
+.page-title {
+    padding: 15upx 0 15upx 30upx;
+    font-size: 26upx;
+    color: #949494;
+    background-color: #eee;
+}
+
+.bigBox{
+    width:100%;
+    background: #fff;
+}
+.pageTitleBox .top{
+}
+.pageTitleBox .top .bottom{
+  width: calc(100% - 60upx);
+  margin-left:  30upx;
+}
+.pageTitleRight,.pageTitleBottom {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 15upx 0 15upx 30upx;
+    font-size: 26upx;
+    color: #949494;
+    background-color: #fff;
+    position: relative;
+}
+.pageTitleRight:after{
+    font-family: uniicons;
+    content: '\e583';
+    position: absolute;
+    right: 24rpx;
+    top: 15upx;
+    color: #bbb;
+    //-webkit-transform: translateY(-50%);
+    //transform: translateY(-50%);
+}
+.pageTitleBottom:after{
+    font-family: uniicons;
+    content: '\e581';
+    position: absolute;
+    right: 24rpx;
+    top: 50%;
+    color: #bbb;
+    -webkit-transform: translateY(-50%);
+    transform: translateY(-50%);
+}
+.pageList{
+    width: 100%;
+    background: #fff;
+    padding-top: 8rpx;
+}
+.pageItem{
+    width: calc(100% - 32rpx);
+    margin-left: 16rpx;
+    margin-bottom: 24rpx;
+    box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.1);
+}
+.pageItem .box{
+  width:100%;
+  box-sizing: border-box;
+  padding: 0 16rpx;
+    border-bottom: 1px solid #fefefe;
+}
+.pageItem .box .top .topTitle{
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  max-width: 400rpx;
+  font-size: 34rpx;
+  padding-bottom: 8rpx;
+}
+.pageItem .box .headerBox{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.pageItem .box .headerBox .shopName{
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  max-width: 400rpx;
+  font-size: 30rpx;
+  padding-bottom: 8rpx;
+}
+.pageItem .box .headerBox .shopPrice{
+  color: #696969;
+  font-size: 24rpx;
+}
+.pageItem .box .headerBox .shopPrice .shopMoney{
+  color: #ee8437;
+  margin-left: 10rpx;
+  font-size: 28rpx;
+}
+
+.pageItem .box .detailBox{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+.pageItem .box .detailBox .leftDetail{
+  display: flex;
+  align-items: center;
+}
+.pageItem .box .detailBox .leftDetail .code{
+  width: 28rpx;
+  height: 28rpx;
+    margin-right: 8rpx;
+}
+
+.pageItem .box .detailBox .leftDetail .codeNumber{
+  color: #696969;
+  font-size: 24rpx;
+}
+.pageItem .box .detailBox .rightDetail .ruleText{
+  color: #696969;
+  font-size: 24rpx;
+}
+
+.pageItem .box .detailBox .rightDetail .typeName{
+  color: #6dbf9c;
+  font-size: 24rpx;
+}
+.pageItem .bottom{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 16rpx;
+  border-top: 1rpx dashed #eee;
+}
+.pageItem .bottom .priceBefore{
+  font-size: 28rpx;
+  color: #ee8437;
+}
+.cat-card {
+  padding: 30upx 0;
+}
+
+.cat-box {
+  justify-content: space-between;
+  display: flex;
+  margin-left: 30upx;
+  margin-right: 30upx;
+}
+
+.cat-title {
+  font-weight: bold;
+}
+
+.card-top {
+
+  padding: 16upx 24upx;
+}
+
+.card-top .product-name {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  max-width: 400upx;
+  font-size: 30upx;
+  padding-bottom: 8upx;
+}
+.opinion2 {
+    width: 100%;
+    padding-top: 30rpx;
+    text-align: center;
+    background-color: #fff;
+    border-radius: 2px 2px 0 0;
+    position: fixed;
+    z-index: 999;
+    width: 90%;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    border-radius: 12rpx;
+    box-sizing: border-box;
+}
+
+.opinion2 {
+    text-align: left;
+    padding: 30rpx;
+    min-height: 400rpx;
+}
+
+.opinion2-title {
+    margin-bottom: 20rpx;
+}
+
+.opinion-title,
+.opinion2-title {
+    font-size: 26rpx;
+    font-weight: bolder;
+}
+
+.card-top .pro-name-box {
+  flex: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.product-detail {
+  color: #696969;
+  font-size: 24upx;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.card-top .pro-orther-box {
+  flex: 1;
+}
+
+.card-top .pro-orther-box .product-detail {
+  justify-content: flex-end;
+}
+
+.product-price {
+  color: #ee8437;
+  margin-left: 10upx;
+}
+
+.product-status {
+  color: #6dbf9c;
+  font-size: 24upx;
+}
+
+.card-detail {
+  border-top: 1upx dashed #eee;
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 24upx 24upx 24upx;
+}
+
+.card-detail li {
+  padding-top: 20upx;
+  line-height: 30upx;
+  /* flex: 33.3%; */
+  font-size: 24upx;
+  color: #888;
+}
+
+.card-change-detail {
+  border-top: 1upx dashed #eee;
+  padding: 0 20upx 20upx 20upx;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+.card-change-detail li {
+  padding-top: 20upx;
+  line-height: 30upx;
+  font-size: 25upx;
+  padding-right: 20upx;
+  display: flex;
+  align-items: center;
+}
+
+.card-change-detail .through-line {
+  text-decoration: line-through;
+  color: #cbcbcb;
+  margin-left: 16upx;
+}
+
+.text-b9 {
+  color: #b9b9b9
+}
+
+.process-box {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: flex-start;
+  overflow: hidden;
+}
+
+.uni-list-cell:after {
+  height: 0;
+}
+.approveBox{
+    width: 100%;
+}
+.approveBox .approveItem{
+    width:100%;
+    box-sizing: border-box;
+    padding: 22rpx 30rpx;
+}
+.approveBox .approveItem .approve{
+  width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.approveItem .approve .approveLeft{
+    display: flex;
+    align-items: center;
+}
+.approve .approveLeft .typeIcon{
+    width: 30rpx;
+    height: 30rpx;
+}
+.approve .approveLeft .approveName{
+  font-size: 24rpx;
+}
+.approveItem .approve .appDate{
+  font-size: 24rpx;
+  color: #8b8a8a;
+}
+.approveItem .approveBottom{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+.approveItem .approveBottom .bottomLeft .leftLabel{
+  color: #676767;
+  font-size: 24rpx;
+}
+.approveItem .approveBottom .bottomRight .rightLabel{
+  font-size: 24rpx;
+  color: #8b8a8a;
+}
+.button-box {
+  padding-top: 36upx;
+  display: flex;
+  /* padding-bottom: 40upx; */
+  justify-content: space-around;
+  padding-bottom: 6upx;
+}
+
+.button-box image {
+  width: 100upx;
+  height: 100upx;
+}
+
+.button-box span {
+  font-size: 24upx;
+  display: flex;
+  flex-direction: column;
+
+  text-align: center;
+}
+
+.ico-user:before {
+  background-image: url('../../static/images/tender/lxr.png');
+}
+
+.ico-sjx:before {
+  background-image: url('../../static/images/expense/sjx.png');
+}
+
+.ico-cate:before {
+  width: 26upx;
+  height: 25upx;
+  background-image: url('../../static/images/txm_logo.png');
+}
+.shenhe-mask {
+    position: fixed;
+    z-index: 998;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, .6);
+}
+.check-btn-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 20rpx;
+
+}
+.check-btn {
+    flex: 1;
+    text-align: center;
+    margin: 0 40rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    color: #fff;
+    text-align: center;
+    font-size: 30rpx;
+    background-color: #64a0e6;
+    border-radius: 10rpx;
+}
+.no-check {
+    background-color: #fff;
+    color: #666;
+    border: 1px solid #d2d2d2;
+}
+.text-content {
+    max-height: 150rpx;
+    height: 400rpx!important;
+    width: 100%;
+    font-size: 28rpx;
+    line-height: 1.5;
+}
+.check-reason {
+    background-color: #f8f9fa;
+    padding: 16rpx 20rpx;
+    box-sizing: border-box;
+    border-radius: 14rpx 14rpx 0 0;
+}
+</style>
diff --git a/pages/ProductReview/productDetail.vue b/pages/ProductReview/productDetail.vue
new file mode 100644
index 0000000..c1eaff1
--- /dev/null
+++ b/pages/ProductReview/productDetail.vue
@@ -0,0 +1,646 @@
+<template>
+	<view>
+		<view class="base-info pb20">
+			<view class="content-title">{{baseData.HIGHWAYPROINST_DESC}}</view>
+			<view class="main-card">
+				<div class="card-title">
+					<h4>{{baseData.SERVERPART_NAME}}</h4>
+					<div class="card-status" :style="baseData.HIGHWAYPROINST_NEXTID!=9000 ?'color:#df7f42;':''">
+						{{proStatus[baseData.HIGHWAYPROINST_NEXTID]}}</div>
+				</div>
+				<div class="base-body" style="align-items: center;">
+					<i class="ico ico-user"></i><span class="item-title">申请人：</span><text>{{baseData.STAFF_NAME}}</text>
+				</div>
+				<div class="base-body" style="align-items: center;">
+					<i class="ico ico-sjx"></i><span class="item-title">创建日期：
+					</span><text>{{baseData.HIGHWAYPROINST_CREATEDATE}}</text>
+				</div>
+				<div class="base-body">
+					<view class="uni-flex" style="align-items: center;">
+						<i class="ico ico-bz"></i><span class="item-title">业务说明： </span>
+
+					</view>
+
+					<text>{{baseData.PROINST_NAME}}</text>
+				</div>
+			</view>
+			<div class="file-body" v-if="baseData.FileList && baseData.FileList.length>0">
+				<div class="uni-flex base-body" style="align-items: center;">
+					<i class="ico ico-fj"></i>
+					<span class="item-title">附件文件</span>
+				</div>
+				<div class="imgBox">
+					<filesUnit v-for="(file,i) in baseData.FileList" :fileItem="file" :key="i"></filesUnit>
+				</div>
+			</div>
+			<div class="file-body" v-if="baseData.QualificationList && baseData.QualificationList.length>0">
+				<div class="uni-flex base-body" style="align-items: center;">
+					<i class="ico ico-fj"></i>
+					<span class="item-title">资质文件</span>
+				</div>
+				<div class="imgBox">
+					<filesUnit v-for="(file,i) in baseData.QualificationList" :fileItem="file" :key="i"></filesUnit>
+				</div>
+			</div>
+			<view class="button-box" v-if="baseData.USER_ID==users.UserId">
+				<span @tap="showPop(4000)">
+					<image src="/static/images/yj-btn.png" mode="aspectFit"></image> 移交
+				</span>
+				<span @tap="showPop(2000)">
+					<image src="/static/images/sh-btn.png" mode="aspectFit"></image> 审核
+				</span>
+				<span @tap="showPop(3000)" v-if="baseData.CAN_REJECT===1">
+					<image src="/static/images/bh-btn.png" mode="aspectFit"></image> 驳回
+				</span>
+			</view>
+
+		</view>
+		<view class="base-info mt20" v-if="baseData.RejectApproved.length>0">
+			<div class="uni-list-cell uni-collapse">
+				<div class="cat-box uni-list-cell-navigate">
+					<b>驳回意见</b>
+				</div>
+				<div class="process-box uni-collapse-content uni-active">
+					<processUnit :item="baseData.RejectApproved[0]" :approveType="0" />
+				</div>
+			</div>
+		</view>
+		<view class="base-info">
+			<div class="uni-list-cell uni-collapse">
+				<div class="cat-box uni-list-cell-navigate"
+					:class="cardShow ? ' uni-navigate-bottom' : 'uni-navigate-right'" @tap="cardShow =!cardShow">
+					<b>审批流程</b>
+				</div>
+				<div class="process-box uni-collapse-content" :class="cardShow ? 'uni-active' : ''" v-show="cardShow">
+					<processUnit v-for="item in baseData.ApproveList" :item="item" :key="item.APPROVED_ID"
+						:approveType="1" />
+				</div>
+			</div>
+		</view>
+		<view class="page-title">{{baseData.ACCEPT_CODE == 100100 ? '商品新增' : '信息修改'}}详情</view>
+
+		<div class="uni-list-cell uni-collapse base-info" v-for="(item,index) in cateArr" :key="index">
+			<div class="cat-box uni-list-cell-navigate"
+				:class="cardShowMap[item.id] ? ' uni-navigate-bottom' : 'uni-navigate-right'" @tap="isShowCate(item)">
+				<b>{{item.name}}</b>
+			</div>
+			<div class="uni-collapse-content" :class="cardShowMap[item.id]? 'uni-active' : ''"
+				v-show="cardShowMap[item.id]">
+				<div class="main-card" v-for="(proUnit, cardIndex) in item.child" :key="cardIndex">
+					<div class="card-top">
+						<view class="uni-flex" style="justify-content: space-between;">
+							<div class="pro-name-box">
+								<p class="product-name">{{proUnit.COMMODITY_NAME}}</p>
+								<!-- <p class="product-detail"><i class="ico ico-cate"></i>{{proUnit.COMMODITY_BARCODE}}</p> -->
+							</div>
+							<div class="pro-orther-box ">
+								<p class="product-detail lh28">
+									<text class="unit-text-b1">售价</text> <b
+										class="product-price">￥{{$util.fmoney(proUnit.COMMODITY_RETAILPRICE,2)}}</b>
+								</p>
+								<!-- <p class="product-detail">{{proUnit.COMMODITY_RULE}} <text style="color: #CCCCCC;margin: 0 8upx;">|</text> {{proUnit.COMMODITY_UNIT}} <text style="color: #CCCCCC;margin: 0 8upx;">|</text> <text :class="proUnit.COMMODITY_STATE==1 ? 'product-status' : 'uni-text-gray'">{{proUnit.COMMODITY_STATE_NAME}}</text></p> -->
+							</div>
+
+						</view>
+						<div class="uni-flex" style="justify-content: space-between;">
+
+							<p class="product-detail"><i class="ico ico-cate"></i>{{proUnit.COMMODITY_BARCODE}}</p>
+
+							<div class="pro-orther-box">
+
+								<p class="product-detail">{{proUnit.COMMODITY_RULE}} <text
+										style="color: #CCCCCC;margin: 0 8upx;">|</text> {{proUnit.COMMODITY_UNIT}} <text
+										style="color: #CCCCCC;margin: 0 8upx;">|</text> <text
+										:class="proUnit.COMMODITY_STATE==1 ? 'product-status' : 'uni-text-gray'">{{proUnit.COMMODITY_STATE_NAME}}</text>
+								</p>
+							</div>
+						</div>
+					</div>
+					<ul :class="(baseData.ACCEPT_CODE==='100100') ? 'card-detail': (changeList[proUnit.COMMODITY_ID] ? 'card-change-detail' : 'no-show')">
+						<template v-if="baseData.ACCEPT_CODE==='100100'">
+							<li style="flex:2;">进货价格：<text
+									style="color:#333;">{{proUnit.COMMODITY_PURCHASEPRICE ? '￥'+$util.fmoney(proUnit.COMMODITY_PURCHASEPRICE) : '-'}}</text></li>
+							<li style="text-align: center;flex:1;">是否散装：<text
+									style="color:#333;">{{proUnit.ISBULK_NAME}}</text></li>
+							<li style="text-align: right;flex:1.5;">称重方式：<text
+									style="color:#333;">{{proUnit.METERINGMETHOD_NAME}}</text></li>
+						</template>
+						<template v-else>
+							<!-- 调整的商品参数 -->
+							<li v-for='(changeItem, i) in changeList[proUnit.COMMODITY_ID]' :key="i">
+								{{changeItem.changeName}}:
+								<template v-if="changeItem.isprice">
+									<b class="product-price">￥{{changeItem.nowV}}</b>
+									<span class="through-line text-b9">￥{{changeItem.org}}</span>
+									<b class="uni-icon"
+										:class="(changeItem.org < changeItem.nowV) ?'uni-icon-arrowthinup': ' uni-icon-arrowthindown'"></b>
+								</template>
+								<template v-else>
+									<text class="uni-text-gray">{{changeItem.nowV}}</text>
+									<text class="through-line">{{changeItem.org}}</text>
+								</template>
+
+							</li>
+						</template>
+						<li v-if="baseData.HIGHWAYPROINST_NEXTID==='9000'">生效时间：<text
+								class="uni-text-gray">{{proUnit.OPERATE_DATE}}</text></li>
+					</ul>
+				</div>
+			</div>
+		</div>
+	</view>
+</template>
+
+<script>
+	const json = {
+		COMMODITY_NAME: '品名',
+		COMMODITY_BARCODE: '条码',
+		COMMODITYTYPE_NAME: '类别',
+		COMMODITY_UNIT: '单位',
+		COMMODITY_RULE: '规格',
+		COMMODITY_STATE_NAME: '状态',
+		COMMODITY_ORI: '产地',
+		COMMODITY_RETAILPRICE: '售价',
+		COMMODITY_PURCHASEPRICE: '进价',
+		BUSINESSTYPE_NAME: '业态',
+		COMMODITY_GRADE_NAME: '质量等级',
+		ISBULK_NAME: '是否散装',
+		METERINGMETHOD_NAME: '称重方式',
+	}
+
+	import {
+		mapGetters
+	} from 'vuex'
+	import processUnit from '@/components/auditingProcess/item.vue'
+	import filesUnit from '@/components/filesComponent/fileUnit.vue'
+
+	export default {
+
+		components: {
+			filesUnit,
+			processUnit
+		},
+		computed: {
+			...mapGetters({
+				'users': 'getUser'
+			}),
+
+		},
+		data() {
+
+			return {
+				baseData: {},
+				pageData: [],
+				changeList: [],
+				cateArr: [],
+				cardShowMap: {},
+				commodityTree: {},
+				cardShow: true,
+				doUser: false,
+				proStatus: {
+					1000: '待受理',
+					2000: '办理中',
+					3000: '已驳回',
+					4000: '已移交',
+					9000: '已审结'
+				}
+			}
+		},
+		methods: {
+			isShowCate(item) {
+
+				this.cardShowMap[item.id] = !this.cardShowMap[item.id]
+			},
+			getYes(val) {
+				return val === 1 ? '是 ' : '否'
+			},
+
+			showPop(type) {
+				let _this = this
+				let url = ''
+				switch (type) {
+					case 4000:
+						url = '/pages/auditingPop/transfer?businessType=2000&PROINST_ID=' + _this.baseData
+							.HIGHWAYPROINST_ID + '&NOWACTINST_ID=' + _this.baseData.NOWACTINST_ID
+						break;
+					case 2000:
+						url = '/pages/auditingPop/toExamine?businessType=2000&PROINST_ID=' + _this.baseData
+							.HIGHWAYPROINST_ID + '&NOWACTINST_ID=' + _this.baseData.NOWACTINST_ID + '&ApproName=' + _this
+							.baseData.ACTINST_NAME + '&NeedApproved=1'
+						break;
+					case 3000:
+						url = '/pages/auditingPop/reject?businessType=2000&PROINST_ID=' + _this.baseData
+							.HIGHWAYPROINST_ID + '&NOWACTINST_ID=' + _this.baseData.NOWACTINST_ID
+						break;
+				}
+				this.$util.toNextRoute('navigateTo', url)
+			},
+
+			getDetail(id) {
+				let _this = this
+				_this.$request.$get("GetCommodityFlowDetail", {
+
+					HIGHWAYPROINST_ID: id
+				}).then(rs => {
+					// console.log(_this.loadingType)
+					if (!rs.ResultCode || rs.ResultCode != '100') {
+						_this.isShow = false
+
+					} else {
+						_this.isShow = true
+					}
+					uni.hideLoading()
+					let _data = rs.Data
+					_this.baseData = _data
+					// 解析附件信息
+					if (_data.FileList) {
+						_data.FileList.map(v => {
+							let name = v.ATTACHMENT_URL.split('.')
+							v.type = name[name.length - 1]
+							v.name = v.ATTACHMENT_DESC
+							v.path = v.ATTACHMENT_URL
+						})
+					}
+					// 解析资质文件信息
+					if (_data.QualificationList) {
+						_data.QualificationList.map(v => {
+							let name = v.IMAGE_URL.split('.')
+							v.type = name[name.length - 1]
+							v.name = v.IMAGE_TITLE
+							v.path = v.IMAGE_URL
+						})
+					}
+					_this.getChange()
+					_this.$forceUpdate()
+
+				})
+			},
+			getChange() { // 获取调整过的商品参数
+				let _this = this
+				let itemName = Object.keys(json) // 数据名称
+				let changeItem = {} //
+				let map = {}
+				let cateArr = []
+				let cardShowMap = {}
+
+				_this.baseData.CommodityList.forEach(item => {
+
+					if (!map[item.COMMODITY_TYPE]) {
+						map[item.COMMODITY_TYPE] = []
+						cardShowMap[item.COMMODITY_TYPE] = true
+						cateArr.push({
+							id: item.COMMODITY_TYPE,
+							name: item.COMMODITYTYPE_NAME,
+							child: map[item.COMMODITY_TYPE]
+						})
+
+					}
+
+					map[item.COMMODITY_TYPE].push(item)
+					itemName.forEach(el => {
+						let fName = 'F_' + el
+
+						// item[el] 现参数值 item[fName] 原参数值
+						if (item[fName] && item[el] !== item[fName]) {
+
+							if (!changeItem[item.COMMODITY_ID]) {
+								changeItem[item.COMMODITY_ID] = []
+							}
+							let originValue = item[fName]
+							let nowValue = item[el]
+							let arr = {
+								changeName: json[el],
+								org: originValue,
+								nowV: nowValue,
+								isprice: false
+							}
+							if (json[el].indexOf('价') > -1) {
+								arr.org = _this.$util.fmoney(originValue, 2)
+								arr.nowV = _this.$util.fmoney(nowValue, 2)
+								arr.isprice = true
+							}
+							changeItem[item.COMMODITY_ID].push(arr)
+						}
+					})
+				})
+				_this.changeList = changeItem
+				// _this.commodityTree = map
+				_this.cateArr = cateArr
+				_this.cardShowMap = cardShowMap
+
+			}
+
+		},
+		onLoad(option) {
+			let _this = this
+			uni.showLoading({
+				title: '正在加载'
+			})
+			this.getDetail(option.id)
+
+			uni.$on('2000', function(data) {
+				if (data) {
+					uni.showLoading({
+						title: '正在加载'
+					})
+					_this.pageData.pageIndex = 1
+					_this.pageData.isEnd = false
+					_this.getDetail(_this.baseData.HIGHWAYPROINST_ID)
+
+				}
+			});
+		},
+		onUnload() {
+			this.$util.addUserBehaviorNew()
+			uni.$off('2000');
+		},
+		onShow() {
+
+		},
+		onHide() {
+
+		}
+	}
+</script>
+
+<style scoped>
+	.mt20 {
+		margin-top: 10upx;
+	}
+
+	.uni-icon {
+		font-size: 28upx;
+		font-weight: bold;
+	}
+
+	.uni-text-gray {
+		font-size: 24upx;
+	}
+
+	.uni-icon-arrowthindown {
+		color: #50b045;
+	}
+
+	.uni-icon-arrowthinup {
+		color: #ff4952;
+	}
+
+	.no-show {
+		display: none;
+	}
+
+	.pb20 {
+		padding-bottom: 40upx;
+	}
+
+	.pb8 {
+		padding-bottom: 8upx;
+	}
+
+	.lh28 {
+		line-height: 54upx;
+	}
+
+	.file-body {
+		padding: 12rpx 26rpx;
+	}
+
+	.imgBox {
+		padding: 0 28rpx;
+	}
+
+	.base-info {
+		background-color: #fff;
+	}
+
+	.base-info+.base-info {
+		margin-top: 20upx;
+	}
+
+	.content-title {
+		height: 115upx;
+		line-height: 115upx;
+		text-align: center;
+		position: relative;
+	}
+
+	.main-card {
+		/* border: 1upx solid #ddd; */
+		border-radius: 6upx;
+		box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.1);
+		margin-left: 24upx;
+		margin-right: 24upx;
+		margin-top: 2rpx;
+	}
+
+	.main-card+.main-card {
+		margin-top: 20upx;
+	}
+
+	.uni-collapse-content .main-card:nth-last-child(1) {
+		margin-bottom: 40upx;
+
+	}
+
+	.card-title {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.card-title h4 {
+		padding: 20upx 0 15upx 20upx;
+	}
+
+	.card-status {
+		font-size: 22upx;
+		color: #999;
+		padding-right: 16upx;
+	}
+
+	.base-body {
+		font-size: 24upx;
+		display: flex;
+		justify-content: flex-start;
+		padding: 15upx 20upx;
+		align-items: flex-start;
+	}
+
+	.item-title {
+		color: #777;
+		width: 120upx;
+		/* text-align: justify; */
+		height: 40upx;
+		font-size: 24upx;
+		/* white-space: nowrap; */
+	}
+
+	.item-title:after {
+		display: inline-block;
+		content: '';
+		padding-left: 100%;
+	}
+
+	.base-body+.base-body {
+		border-top: 1upx dashed #eee;
+	}
+
+	.page-title {
+
+		padding: 15upx 0 15upx 30upx;
+		font-size: 26upx;
+		color: #949494;
+		background-color: #eee;
+	}
+
+	.cat-card {
+		padding: 30upx 0;
+	}
+
+	.cat-box {
+		justify-content: space-between;
+		display: flex;
+		margin-left: 30upx;
+		margin-right: 30upx;
+	}
+
+	.cat-title {
+		font-weight: bold;
+	}
+
+	.card-top {
+
+		padding: 16upx 24upx;
+	}
+
+	.card-top .product-name {
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		max-width: 400upx;
+		font-size: 30upx;
+		padding-bottom: 8upx;
+	}
+
+	.card-top .pro-name-box {
+		flex: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.product-detail {
+		color: #696969;
+		font-size: 24upx;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.card-top .pro-orther-box {
+		flex: 1;
+	}
+
+	.card-top .pro-orther-box .product-detail {
+		justify-content: flex-end;
+	}
+
+	.product-price {
+		color: #ee8437;
+		margin-left: 10upx;
+	}
+
+	.product-status {
+		color: #6dbf9c;
+		font-size: 24upx;
+	}
+
+	.card-detail {
+		border-top: 1upx dashed #eee;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 24upx 24upx 24upx;
+	}
+
+	.card-detail li {
+		padding-top: 20upx;
+		line-height: 30upx;
+		/* flex: 33.3%; */
+		font-size: 24upx;
+		color: #888;
+	}
+
+	.card-change-detail {
+		border-top: 1upx dashed #eee;
+		padding: 0 20upx 20upx 20upx;
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+	}
+
+	.card-change-detail li {
+		padding-top: 20upx;
+		line-height: 30upx;
+		font-size: 25upx;
+		padding-right: 20upx;
+		display: flex;
+		align-items: center;
+	}
+
+	.card-change-detail .through-line {
+		text-decoration: line-through;
+		color: #cbcbcb;
+		margin-left: 16upx;
+	}
+
+	.text-b9 {
+		color: #b9b9b9
+	}
+
+	.process-box {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: flex-start;
+		overflow: hidden;
+	}
+
+	.uni-list-cell:after {
+		height: 0;
+	}
+
+	.button-box {
+		padding-top: 36upx;
+		display: flex;
+		/* padding-bottom: 40upx; */
+		justify-content: space-around;
+		padding-bottom: 6upx;
+	}
+
+	.button-box image {
+		width: 100upx;
+		height: 100upx;
+	}
+
+	.button-box span {
+		font-size: 24upx;
+		display: flex;
+		flex-direction: column;
+
+		text-align: center;
+	}
+
+	.ico-user:before {
+		background-image: url('../../static/images/tender/lxr.png');
+	}
+
+	.ico-sjx:before {
+		background-image: url('../../static/images/expense/sjx.png');
+	}
+
+	.ico-cate:before {
+		width: 26upx;
+		height: 25upx;
+		background-image: url('../../static/images/txm_logo.png');
+	}
+</style>
diff --git a/pages/ProductReview/transferPage.vue b/pages/ProductReview/transferPage.vue
new file mode 100644
index 0000000..66373e7
--- /dev/null
+++ b/pages/ProductReview/transferPage.vue
@@ -0,0 +1,47 @@
+<template>
+  <view>
+  </view>
+</template>
+<script>
+import {mapState} from "vuex";
+
+export default {
+  data() {
+    return {}
+  },
+  computed: {
+      ...mapState({
+          user: (state)=>{
+              return {
+                  UserId: state.userData.UserId,
+                  UserName: state.userData.UserName,
+                  Membership_Phone: state.userData.Membership_Phone,
+                  Membership_Id: state.userData.Membership_Id,
+                  Membership_Type: state.userData.Membership_Type
+              }
+          },
+          toDoMsg: (state)=>{
+              return state.toDoMsg
+          },
+          menus: (state)=> {
+              return state.userData.AuthorityInfo
+          }
+      }),
+  },
+  onLoad(){
+      if (this.menus['d55da792-5edc-4b73-8635-07246121157f']===1){
+          this.$util.toNextRoute('redirectTo', "/pages/businessApproval/newApproval")
+      }else{
+          this.$util.toNextRoute('redirectTo', "/pages/businessApproval/businessApproval")
+      }
+  },
+  methods:{
+
+  }
+}
+</script>
+
+
+<style scoped>
+
+</style>
diff --git a/pages/everdayRenven/index.vue b/pages/everdayRenven/index.vue
index dfbc7aa..8778e5a 100644
--- a/pages/everdayRenven/index.vue
+++ b/pages/everdayRenven/index.vue
@@ -4,14 +4,8 @@
       <template>
         <div class="new-content">
           <div class="header-card">
-            <image
-              :src="
-                '/static/images/revenue/' + theRequest.ProvinceCode + '.png'
-              "
-              mode="aspectFit"
-              class="head-log"
-              v-if="theRequest.ProvinceCode"
-            ></image>
+            <image :src="'/static/images/revenue/' + theRequest.ProvinceCode + '.png'
+              " mode="aspectFit" class="head-log" v-if="theRequest.ProvinceCode"></image>
             <view class="head-cost-text"> 实时营收 </view>
             <div class="top-number">
               <text>{{ today.timeMoney || "0.00" }}</text>
@@ -20,8 +14,7 @@
               <text class="fs12">客单交易&nbsp;&nbsp;&nbsp;&nbsp;</text>
               <text class="ml10"> {{ today.totalTicketCount || 0 }}</text>
               <text class="fs12">(单)</text>
-              <text class="ml-135 fs12"
-                >客单均价&nbsp;&nbsp;&nbsp;&nbsp;¥
+              <text class="ml-135 fs12">客单均价&nbsp;&nbsp;&nbsp;&nbsp;¥
               </text>
               <text>{{ today.avrticketCount || "0.00" }}</text>
             </div>
@@ -29,19 +22,10 @@
         </div>
         <div class="modle-title jc-between uni-flex ai-center">
           <div class="uni-flex ai-center">
-            <image
-              src="/static/images/revenue/yestoday-an.png"
-              mode="aspectFit"
-            ></image>
+            <image src="/static/images/revenue/yestoday-an.png" mode="aspectFit"></image>
             <text class="strong-text ml10">营收汇总</text>
           </div>
-          <picker
-            mode="date"
-            @change="bindDateChange"
-            :end="lastDay"
-            start="2019-12-01"
-            :value="theRequest.time"
-          >
+          <picker mode="date" @change="bindDateChange" :end="lastDay" start="2019-12-01" :value="theRequest.time">
             <text class="revenue-date">{{ headMsg.dayOfShow }}</text>
           </picker>
         </div>
@@ -52,20 +36,14 @@
               <span>元</span>
             </div>
             <div class="uni-flex ai-center">
-              <div
-                v-if="theRequest.GroupType != '1000'"
-                style="margin-right: 8rpx"
-              >
+              <div v-if="theRequest.GroupType != '1000'" style="margin-right: 8rpx">
                 {{ headMsg.name }}
               </div>
               <div class="upLoad-text">{{ headMsg.uploadState }}</div>
             </div>
           </div>
           <!-- 营收数据总览 -->
-          <div
-            class="uni-flex justify-around mode-content"
-            v-if="headMsg.MARKET_REVENUE"
-          >
+          <div class="uni-flex justify-around mode-content" v-if="headMsg.MARKET_REVENUE">
             <div class="check-unit">
               <text>商超营收</text>
               <div class="check-price-color">
@@ -143,10 +121,7 @@
               </div>
             </div>
           </div>
-          <div
-            class="uni-flex justify-around mode-content"
-            v-if="headMsg.ShowTM"
-          >
+          <div class="uni-flex justify-around mode-content" v-if="headMsg.ShowTM">
             <div class="check-unit">
               <text>通美公司</text>
               <div class="check-price-color">
@@ -161,32 +136,18 @@
       </template>
       <view style="background-color: #fff">
         <!-- 昨日日结上传 -->
-        <div
-          class="uni-inline-item modle-title jc-between"
-          v-if="regionList.length > 0"
-        >
+        <div class="uni-inline-item modle-title jc-between" v-if="regionList.length > 0">
           <view class="uni-inline-item">
-            <image
-              src="/static/images/revenue/yestoday-region.png"
-              mode="aspectFit"
-            ></image>
+            <image src="/static/images/revenue/yestoday-region.png" mode="aspectFit"></image>
             <text class="strong-text">日结上传</text>
           </view>
-          <view
-            style="font-size: 26rpx"
-            v-if="theRequest.ProvinceCode == '340000'"
-            >门店上传&nbsp;&nbsp;
-            <span class="upload-count">{{ headMsg.uploadState }}</span></view
-          >
+          <view style="font-size: 26rpx" v-if="theRequest.ProvinceCode == '340000'">门店上传&nbsp;&nbsp;
+            <span class="upload-count">{{ headMsg.uploadState }}</span>
+          </view>
         </div>
 
         <template v-if="theRequest && theRequest.GroupType == 1020">
-          <div
-            v-for="(item, i) in regionList"
-            :key="i"
-            class="region-cell"
-            @tap="toDetail(item)"
-          >
+          <div v-for="(item, i) in regionList" :key="i" class="region-cell" @tap="toDetail(item)">
             <div class="region-cell-unit">
               <text>{{ item.SERVERPART_NAME }}</text>
               <div class="ct01">
@@ -202,21 +163,18 @@
                 <text class="strong-text">{{
                   item.TOTAL_COUNT > item.UPLOAD_COUNT
                     ? $util.fmoney(
-                        (item.UPLOAD_COUNT / item.TOTAL_COUNT) * 100,
-                        2
-                      )
+                      (item.UPLOAD_COUNT / item.TOTAL_COUNT) * 100,
+                      2
+                    )
                     : 100
                 }}</text>
                 <text>%</text>
               </div>
             </div>
-            <div
-              class="region-cell-unit"
-              :class="{
-                'ct-red': item.UPLOAD_COUNT != item.TOTAL_COUNT,
-                'weisc-ico': item.UPLOAD_COUNT != item.TOTAL_COUNT,
-              }"
-            >
+            <div class="region-cell-unit" :class="{
+              'ct-red': item.UPLOAD_COUNT != item.TOTAL_COUNT,
+              'weisc-ico': item.UPLOAD_COUNT != item.TOTAL_COUNT,
+            }">
               {{ item.UPLOADSTATE }}
             </div>
             <div class="region-cell-image">
@@ -225,12 +183,8 @@
           </div>
         </template>
         <template v-else-if="theRequest && theRequest.GroupType == 1000">
-          <div
-            class="region-title"
-            :class="{ active: regionShow1 }"
-            v-show="regionList.length > 1"
-            @tap="regionShow1 = !regionShow1"
-          >
+          <div class="region-title" :class="{ active: regionShow1 }" v-show="regionList.length > 1"
+            @tap="regionShow1 = !regionShow1">
             省内区域
           </div>
           <div v-show="regionShow1">
@@ -251,41 +205,29 @@
                     <text class="strong-text">{{
                       item.TOTAL_COUNT > item.UPLOAD_COUNT
                         ? $util.fmoney(
-                            (item.UPLOAD_COUNT / item.TOTAL_COUNT) * 100,
-                            2
-                          )
+                          (item.UPLOAD_COUNT / item.TOTAL_COUNT) * 100,
+                          2
+                        )
                         : "100.00"
                     }}</text>
                     <text>%</text>
                   </div>
                 </div>
-                <div
-                  class="region-cell-unit"
-                  :class="{ 'ct-red': item.UPLOAD_COUNT != item.TOTAL_COUNT }"
-                >
+                <div class="region-cell-unit" :class="{ 'ct-red': item.UPLOAD_COUNT != item.TOTAL_COUNT }">
                   {{ item.UPLOADSTATE }}
                 </div>
                 <div class="region-cell-image">
-                  <text
-                    class="uni-icon-arrowright uni-icon"
-                    :class="{ active: item.show }"
-                  ></text>
+                  <text class="uni-icon-arrowright uni-icon" :class="{ active: item.show }"></text>
                 </div>
               </div>
               <ul class="region-cell-area" v-show="item.show">
-                <li
-                  v-for="(child, index) in item.ServerpartList"
-                  :class="{ visited: child.visited }"
-                  :key="index"
-                  @tap="toDetail(child)"
-                >
+                <li v-for="(child, index) in item.ServerpartList" :class="{ visited: child.visited }" :key="index"
+                  @tap="toDetail(child)">
                   <div>{{ child.SERVERPART_NAME }}</div>
                   <div>{{ $util.fmoney(child.CASHPAY, 2) }}<text>元</text></div>
-                  <div
-                    :class="{
-                      'ct-red': child.UPLOAD_COUNT != child.TOTAL_COUNT,
-                    }"
-                  >
+                  <div :class="{
+                    'ct-red': child.UPLOAD_COUNT != child.TOTAL_COUNT,
+                  }">
                     {{ child.UPLOADSTATE }}
                   </div>
                 </li>
@@ -293,12 +235,8 @@
             </block>
           </div>
           <template v-if="regionList.length > 1">
-            <div
-              class="region-title"
-              :class="{ active: regionShow2 }"
-              v-show="regionList.length > 1"
-              @tap="regionShow2 = !regionShow2"
-            >
+            <div class="region-title" :class="{ active: regionShow2 }" v-show="regionList.length > 1"
+              @tap="regionShow2 = !regionShow2">
               省外区域
             </div>
             <div v-show="regionShow2">
@@ -319,18 +257,15 @@
                       <text class="strong-text">{{
                         item.TOTAL_COUNT > item.UPLOAD_COUNT
                           ? $util.fmoney(
-                              (item.UPLOAD_COUNT / item.TOTAL_COUNT) * 100,
-                              2
-                            )
+                            (item.UPLOAD_COUNT / item.TOTAL_COUNT) * 100,
+                            2
+                          )
                           : "100.00"
                       }}</text>
                       <text>%</text>
                     </div>
                   </div>
-                  <div
-                    class="region-cell-unit"
-                    :class="{ 'ct-red': item.UPLOAD_COUNT != item.TOTAL_COUNT }"
-                  >
+                  <div class="region-cell-unit" :class="{ 'ct-red': item.UPLOAD_COUNT != item.TOTAL_COUNT }">
                     {{ item.UPLOADSTATE }}
                   </div>
                   <div class="region-cell-image">
@@ -338,19 +273,13 @@
                   </div>
                 </div>
                 <ul class="region-cell-area" v-show="item.show">
-                  <li
-                    v-for="(child, index) in item.ServerpartList"
-                    :class="{ visited: child.visited }"
-                    :key="index"
-                    @tap="toDetail(child, '451200')"
-                  >
+                  <li v-for="(child, index) in item.ServerpartList" :class="{ visited: child.visited }" :key="index"
+                    @tap="toDetail(child, '451200')">
                     <div>{{ child.SERVERPART_NAME }}</div>
                     <div>{{ child.CASHPAY }}<text>元</text></div>
-                    <div
-                      :class="{
-                        'ct-red': child.UPLOAD_COUNT != child.TOTAL_COUNT,
-                      }"
-                    >
+                    <div :class="{
+                      'ct-red': child.UPLOAD_COUNT != child.TOTAL_COUNT,
+                    }">
                       {{ child.UPLOADSTATE }}
                     </div>
                   </li>
@@ -360,167 +289,96 @@
           </template>
         </template>
         <template v-else>
-          <shopCell
-            v-for="(item, i) in regionList"
-            :key="i"
-            :item="item"
-            @toggleShow="toggleShow"
-            :i="i"
-          >
+          <shopCell v-for="(item, i) in regionList" :key="i" :item="item" @toggleShow="toggleShow" :i="i">
           </shopCell>
         </template>
 
         <!-- 除安徽省外的 昨日营收占比 -->
-        <div
-          v-if="
-            theRequest &&
-            theRequest.GroupType != 1010 &&
-            theRequest.ProvinceCode != '340000'
-          "
-        >
+        <div v-if="
+          theRequest &&
+          theRequest.GroupType != 1010 &&
+          theRequest.ProvinceCode != '340000'
+        ">
           <div class="uni-inline-item modle-title">
-            <image
-              src="/static/images/revenue/type-operation.png"
-              mode="aspectFit"
-            ></image>
+            <image src="/static/images/revenue/type-operation.png" mode="aspectFit"></image>
             <text class="strong-text">营收占比</text>
           </div>
           <view class="box-operation">
             <div class="operation-tab-box">
-              <div
-                class="operation-tab-unit"
-                v-if="modelProgress.length > 0"
-                @tap="selectTab('nowTab', 4)"
-                :class="{ active: nowTab == 4 }"
-              >
+              <div class="operation-tab-unit" v-if="modelProgress.length > 0" @tap="selectTab('nowTab', 4)"
+                :class="{ active: nowTab == 4 }">
                 经营模式
               </div>
-              <div
-                class="operation-tab-unit"
-                v-if="regionProgress.length > 0"
-                @tap="selectTab('nowTab', 1)"
-                :class="{ active: nowTab == 1 }"
-              >
+              <div class="operation-tab-unit" v-if="regionProgress.length > 0" @tap="selectTab('nowTab', 1)"
+                :class="{ active: nowTab == 1 }">
                 经营业态
               </div>
-              <div
-                class="operation-tab-unit"
-                v-if="tradeType.length > 0"
-                @tap="selectTab('nowTab', 2)"
-                :class="{ active: nowTab == 2 }"
-              >
+              <div class="operation-tab-unit" v-if="tradeType.length > 0" @tap="selectTab('nowTab', 2)"
+                :class="{ active: nowTab == 2 }">
                 经营类型
               </div>
-              <div
-                class="operation-tab-unit"
-                v-if="areaProgress.length > 0"
-                @tap="selectTab('nowTab', 3)"
-                :class="{ active: nowTab == 3 }"
-              >
+              <div class="operation-tab-unit" v-if="areaProgress.length > 0" @tap="selectTab('nowTab', 3)"
+                :class="{ active: nowTab == 3 }">
                 区域营收
               </div>
             </div>
             <div class="operation-content-box">
               <div v-show="nowTab == 1" v-if="regionProgress.length > 0">
-                <canvas
-                  canvas-id="businessCont"
-                  id="businessCont"
-                  class="operation-content"
-                  @touchstart="touchPie($event, 'businessCont')"
-                ></canvas>
+                <canvas canvas-id="businessCont" id="businessCont" class="operation-content"
+                  @touchstart="touchPie($event, 'businessCont')"></canvas>
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in regionProgress"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in regionProgress" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }} {{ item.bili }}%</text>
                       <text>{{ item.data }}元</text>
                     </div>
                     <div class="progress">
-                      <div
-                        class="bgO"
-                        :style="{ width: item.bili + '%' }"
-                      ></div>
+                      <div class="bgO" :style="{ width: item.bili + '%' }"></div>
                     </div>
                   </div>
                 </div>
               </div>
               <div v-show="nowTab == 2" v-if="tradeType.length > 0">
-                <canvas
-                  canvas-id="typeCont"
-                  id="typeCont"
-                  class="operation-content"
-                  @touchstart="touchPie($event, 'typeCont')"
-                ></canvas>
+                <canvas canvas-id="typeCont" id="typeCont" class="operation-content"
+                  @touchstart="touchPie($event, 'typeCont')"></canvas>
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in tradeType"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in tradeType" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }} {{ item.bili }}%</text>
                       <text>{{ item.data }}元</text>
                     </div>
                     <div class="progress">
-                      <div
-                        class="bgO"
-                        :style="{ width: item.bili + '%' }"
-                      ></div>
+                      <div class="bgO" :style="{ width: item.bili + '%' }"></div>
                     </div>
                   </div>
                 </div>
               </div>
               <div v-show="nowTab == 3" v-if="areaProgress.length > 0">
-                <canvas
-                  canvas-id="areaCont"
-                  id="areaCont"
-                  class="operation-content"
-                  @touchstart="touchPie($event, 'areaCont')"
-                ></canvas>
+                <canvas canvas-id="areaCont" id="areaCont" class="operation-content"
+                  @touchstart="touchPie($event, 'areaCont')"></canvas>
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in areaProgress"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in areaProgress" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }} {{ item.bili }}%</text>
                       <text>{{ item.data }}元</text>
                     </div>
                     <div class="progress">
-                      <div
-                        class="bgO"
-                        :style="{ width: item.bili + '%' }"
-                      ></div>
+                      <div class="bgO" :style="{ width: item.bili + '%' }"></div>
                     </div>
                   </div>
                 </div>
               </div>
               <div v-show="nowTab == 4" v-if="modelProgress.length > 0">
-                <canvas
-                  canvas-id="modelCont"
-                  id="modelCont"
-                  class="operation-content"
-                  @touchstart="touchPie($event, 'modelCont')"
-                ></canvas>
+                <canvas canvas-id="modelCont" id="modelCont" class="operation-content"
+                  @touchstart="touchPie($event, 'modelCont')"></canvas>
                 <div>
-                  <div
-                    class="operation-c-list"
-                    v-for="(item, o) in modelProgress"
-                    :key="o"
-                  >
+                  <div class="operation-c-list" v-for="(item, o) in modelProgress" :key="o">
                     <div class="operation-cl-unit">
                       <text>{{ item.name }} {{ item.bili }}%</text>
                       <text>{{ item.data }}元</text>
                     </div>
                     <div class="progress">
-                      <div
-                        class="bgO"
-                        :style="{ width: item.bili + '%' }"
-                      ></div>
+                      <div class="bgO" :style="{ width: item.bili + '%' }"></div>
                     </div>
                   </div>
                 </div>
@@ -532,55 +390,39 @@
         <view v-if="revenuelineList[0]">
           <div class="uni-flex ai-center jc-between">
             <view class="uni-inline-item modle-title">
-              <image
-                src="/static/images/revenue/ysqs.png"
-                mode="aspectFit"
-              ></image>
+              <image src="/static/images/revenue/ysqs.png" mode="aspectFit"></image>
               <text class="strong-text">营收趋势</text>
             </view>
             <view class="line-tab-unit active"> 近七日 </view>
           </div>
           <view class="revenue-line-box">
             <view class="uni-flex ai-center">
-              <view
-                class="revenue-line-data"
-                :class="{ active: revenueLineType == 0 }"
-                @click="changeDate('revenueLineType', 0)"
-              >
+              <view class="revenue-line-data" :class="{ active: revenueLineType == 0 }"
+                @click="changeDate('revenueLineType', 0)">
                 <p>营收金额</p>
                 <p>{{ $util.fmoney(revenueLineMsg.Revenue_Amount, 2) }}</p>
               </view>
-              <view
-                class="revenue-line-data"
-                :class="{ active: revenueLineType == 1 }"
-                @click="changeDate('revenueLineType', 1)"
-              >
+              <view class="revenue-line-data" :class="{ active: revenueLineType == 1 }"
+                @click="changeDate('revenueLineType', 1)">
                 <p>客单笔数</p>
                 <p>{{ $util.fmoney(revenueLineMsg.Ticke_Count, 2) }}</p>
               </view>
-              <view
-                class="revenue-line-data"
-                :class="{ active: revenueLineType == 2 }"
-                @click="changeDate('revenueLineType', 2)"
-              >
+              <view class="revenue-line-data" :class="{ active: revenueLineType == 2 }"
+                @click="changeDate('revenueLineType', 2)">
                 <p>客单均价</p>
                 <p>{{ $util.fmoney(revenueLineMsg.Average_Amount, 2) }}</p>
               </view>
             </view>
             <view class="text-title">
               {{ typeName[revenueLineType] }}比上周
-              <text class="text-week"
-                >({{ `${sevenDate[0]}-${sevenDate[1]}` }})</text
-              ></view
-            >
-            <view
-              :class="{
-                'up-text-title':
-                  revenuelineList[revenueLineType].Top_Difference > 0,
-                'down-text-title':
-                  revenuelineList[revenueLineType].Top_Difference < 0,
-              }"
-            >
+              <text class="text-week">({{ `${sevenDate[0]}-${sevenDate[1]}` }})</text>
+            </view>
+            <view :class="{
+              'up-text-title':
+                revenuelineList[revenueLineType].Top_Difference > 0,
+              'down-text-title':
+                revenuelineList[revenueLineType].Top_Difference < 0,
+            }">
               {{
                 $util
                   .fmoney(revenuelineList[revenueLineType].Top_Difference, 2)
@@ -589,46 +431,30 @@
             </view>
             <view class="text-title">{{ typeName[revenueLineType] }}趋势</view>
             <view>
-              <canvas
-                canvas-id="revenueLine"
-                id="revenueLine"
-                class="operation-content"
-                @touchstart="touchPie($event, 'revenueLine')"
-              ></canvas>
+              <canvas canvas-id="revenueLine" id="revenueLine" class="operation-content"
+                @touchstart="touchPie($event, 'revenueLine')"></canvas>
             </view>
           </view>
           <view class="revenue-line-box">
             <view class="title">客单交易</view>
             <view class="text-title"> 客单数量比上周 </view>
-            <view
-              :class="{
-                'up-text-title': revenueLineMsg.down_deff > 0,
-                'down-text-title': revenueLineMsg.down_deff < 0,
-              }"
-            >
+            <view :class="{
+              'up-text-title': revenueLineMsg.down_deff > 0,
+              'down-text-title': revenueLineMsg.down_deff < 0,
+            }">
               {{ $util.fmoney(revenueLineMsg.down_deff, 2).replace("-", "") }}%
             </view>
             <view>
-              <canvas
-                canvas-id="revenueClounm"
-                id="revenueClounm"
-                class="operation-content"
-              ></canvas>
+              <canvas canvas-id="revenueClounm" id="revenueClounm" class="operation-content"></canvas>
             </view>
           </view>
         </view>
         <!-- 商品销售排行 -->
         <div class="uni-inline-item modle-title">
-          <image
-            src="/static/images/revenue/product-ranking.png"
-            mode="aspectFit"
-          ></image>
+          <image src="/static/images/revenue/product-ranking.png" mode="aspectFit"></image>
           <text class="strong-text">商品销售排行</text>
         </div>
-        <RankContent
-          :wechatPushSalesList="wechatPushSalesList"
-          v-if="!isLoading"
-        ></RankContent>
+        <RankContent :wechatPushSalesList="wechatPushSalesList" v-if="!isLoading"></RankContent>
         <!-- <div class="uni-inline-item ranking-tab-box">
 					<div class="ranking-tab-unit" @tap="selectTab('nowRank',1000)" :class="{'active':nowRank==1000}">商超
 					</div>
@@ -654,10 +480,7 @@
       </view>
     </view>
     <div v-if="!showPage && !isLoading">
-      <noFound
-        :nodata="!showPage && !isLoading"
-        :text="'您暂无' + lastDay + '营收数据'"
-      />
+      <noFound :nodata="!showPage && !isLoading" :text="'您暂无' + lastDay + '营收数据'" />
     </div>
   </div>
 </template>
@@ -781,8 +604,8 @@ export default {
       let canToSeverpartIndex = !provinceId
         ? this.hasSeverpartIndexAuthority
         : this.PushAuthority.some((n) => {
-            return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1;
-          });
+          return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1;
+        });
       this.$util.toNextRoute(
         "navigateTo",
         canToSeverpartIndex ? severpartIndexPath : serverpartUploadPath
@@ -980,9 +803,9 @@ export default {
       headMsg.diffBili =
         _data1.BUDGETAMOUNT > 0
           ? this.$util.fmoney(
-              (headMsg.diffBudgetTotal / _data1.BUDGETAMOUNT) * 100,
-              2
-            )
+            (headMsg.diffBudgetTotal / _data1.BUDGETAMOUNT) * 100,
+            2
+          )
           : "100";
       headMsg.uploadState = _data2 ? s1 + "/" + s2 : _data1.UPLOADSTATE;
       this.headMsg = headMsg;
@@ -1526,7 +1349,7 @@ export default {
       title: "正在加载...",
     });
     const toSnhuiPageProvinceCode = [
-      340000, 520000, 451200, 510000, 530000, 620000, 630000, 330200, 330300,
+      340000, 520000, 451200, 510000, 530000, 620000, 630000, 330200, 330300, 734100
     ]; // 需要跳转到安徽类型的每日营收推送页面
 
     if (option.ProvinceCode) {
@@ -1599,6 +1422,7 @@ export default {
       this.theRequest.ProvinceCode != 510000 &&
       this.theRequest.ProvinceCode != 620000 &&
       this.theRequest.ProvinceCode != 630000 &&
+      this.theRequest.ProvinceCode != 734100 &&
       this.theRequest.ProvinceCode != 330200
     ) {
       uni.setNavigationBarColor({
@@ -1975,12 +1799,12 @@ text.fs12 {
   background-color: #f7f7f7;
 }
 
-.region-cell-area li > div {
+.region-cell-area li>div {
   flex: 2;
   font-size: 22rpx;
 }
 
-.region-cell-area li > div:nth-child(1) {
+.region-cell-area li>div:nth-child(1) {
   flex: 3;
   text-align: left;
 }
@@ -2018,7 +1842,7 @@ text.fs12 {
   box-shadow: 1rpx 0rpx 6rpx 0px rgba(224, 224, 224, 0.54);
 }
 
-.revenue-line-box + .revenue-line-box {
+.revenue-line-box+.revenue-line-box {
   margin-top: 38rpx;
 }
 
@@ -2035,7 +1859,7 @@ text.fs12 {
   box-sizing: border-box;
 }
 
-.revenue-line-data + .revenue-line-data {
+.revenue-line-data+.revenue-line-data {
   margin-left: 24rpx;
 }
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b3a5616..355f197 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,24 +1,13 @@
 <template>
   <view class="content" v-show="menus">
-    <menuModel
-      v-for="(menu, index) in modelMenu"
-      :key="index"
-      :title="menu.name"
-      :class="{ 'line-block': index != 0 }"
-    >
+    <menuModel v-for="(menu, index) in modelMenu" :key="index" :title="menu.name" :class="{ 'line-block': index != 0 }">
       <view class="uni-flex align-top" name="slot">
-        <menuItem
-          v-for="item in menu.list"
-          :key="item.id"
-          :item="item"
-          :doCout="toDoMsg ? toDoMsg[item.id] : 0"
-          :active="
-            item.id == 'd5a9e3ef-3699-448f-abcc-819179df60bd' ||
+        <menuItem v-for="item in menu.list" :key="item.id" :item="item" :doCout="toDoMsg ? toDoMsg[item.id] : 0"
+          :active="item.id == 'd5a9e3ef-3699-448f-abcc-819179df60bd' ||
             menus[item.id] == 1 ||
             this.membershipType === 9999
-          "
-          @handleClick="toPage"
-        ></menuItem>
+            " @handleClick="toPage">
+        </menuItem>
       </view>
     </menuModel>
     <!-- 	<view class="home-model">
@@ -166,11 +155,60 @@ export default {
       uni.scanCode({
         onlyFromCamera: true,
         success: function (res) {
-          console.log("条码类型：" + res.scanType);
-          console.log("条码内容：" + res.result);
           if (res.scanType.indexOf("QR_CODE") > -1) {
             if (res.result.indexOf("pages/walkAroundManager/index") > -1) {
-              _this.$util.toNextRoute("navigateTo", "/" + res.result);
+              // 地址路径
+              let pageUrl = res.result
+              console.log('res.resultres.resultres.result', res.result);
+              let pageObj = _this.handleGetId(res.result)
+              let CacheObj = uni.getStorageSync('CacheObj')
+              if (CacheObj) {
+                let title = ''
+                let content = ''
+                let same = false
+                console.log('CacheObj.id', CacheObj.id);
+                console.log('ididididid', pageObj.id);
+                // 判断缓存中的内容 是不是当前点位的信息
+                if (Number(CacheObj.id) === Number(pageObj.id)) {
+                  title = '发现未提交的巡查草稿'
+                  content = '检测到您上次有未提交的巡查内容，是否恢复这些数据继续编辑？'
+                  same = true
+                } else if (CacheObj.id) {
+                  title = `发现未提交的巡查`
+                  content = `点击跳转将跳转到【${CacheObj.title}】点位巡查`
+                  same = false
+                }
+                uni.showModal({
+                  title: title,
+                  content: content,
+                  cancelText: '重新开始',
+                  confirmText: same ? '恢复草稿' : "跳转点位",
+                  success: async function (res) {
+                    if (same) {
+                      if (res.confirm) {
+
+                        _this.$util.toNextRoute("navigateTo", "/" + pageUrl + `&&pageType=1`);
+                      } else if (res.cancel) {
+                        uni.setStorageSync('CacheObj', null)
+                        _this.$util.toNextRoute("navigateTo", "/" + pageUrl);
+                      }
+                    } else {
+                      if (res.confirm) {
+                        _this.$util.toNextRoute("navigateTo", `/pages/walkAroundManager/index?id=${CacheObj.id}&&pageType=1`);
+                      } else if (res.cancel) {
+                        uni.setStorageSync('CacheObj', null)
+                        _this.$util.toNextRoute("navigateTo", "/" + pageUrl);
+                      }
+
+                    }
+                  }
+                })
+
+              } else {
+                _this.$util.toNextRoute("navigateTo", "/" + res.result);
+              }
+
+              // _this.$util.toNextRoute("navigateTo", "/" + res.result);
             } else {
               let result = res.result.toLocaleLowerCase();
               if (
@@ -223,6 +261,16 @@ export default {
         },
       });
     },
+    // 拿到二维码  ?id=388 的id值
+    handleGetId(url) {
+      const query = url.split('?')[1];
+      if (!query) return {};
+      return query.split('&').reduce((acc, item) => {
+        const [key, value] = item.split('=');
+        acc[key] = value;
+        return acc;
+      }, {});
+    },
     recordBrowsing(item) {
       // 点击业务模块事件
       let _this = this;
@@ -294,8 +342,8 @@ export default {
       console.log("this.modelMenu", this.modelMenu);
     },
   },
-  onReady() {},
-  onShow() {},
+  onReady() { },
+  onShow() { },
   onPullDownRefresh() {
     let _this = this;
     this.updateUser();
@@ -322,6 +370,7 @@ export default {
   flex-direction: column;
   justify-content: center;
 }
+
 .uni-flex {
   align-items: center;
   flex-wrap: wrap;
diff --git a/pages/walkAroundManager/index.vue b/pages/walkAroundManager/index.vue
index 33e99b8..2f6ba9b 100644
--- a/pages/walkAroundManager/index.vue
+++ b/pages/walkAroundManager/index.vue
@@ -65,7 +65,8 @@
                 <label class="choiceItem" v-for="(subItem, subIndex) in item.question.options" :key="subItem.text"
                   :style="{ marginBottom: subIndex + 1 === item.question.options.length ? '0' : '' }">
                   <view>
-                    <radio :value="subItem.text" color="#409eff" style="transform: scale(0.8)" />
+                    <radio :checked="item.choiceResponse[0] === subItem.text" :value="subItem.text" color="#409eff"
+                      style="transform: scale(0.8)" />
                     <!-- :checked="subIndex === current" -->
                   </view>
                   <view>{{ subItem.text }}</view>
@@ -165,7 +166,7 @@
     <view class="bottomBtnBox">
       <view class="bottomBtn" @click="submitUpload">提交</view>
     </view>
-
+    <!-- 
     <view v-if="false">
       <div class="pageHeader">
         <div class="hederContent">
@@ -271,7 +272,7 @@
 
         <button v-if="!submit" class="btn" @click="submitUpload">提交</button>
       </div>
-    </view>
+    </view> -->
 
     <uniPopup ref="checkPopup" type="bottom" :show="isShowPopup" @hidePopup="handleClosePopup">
       <view class="popupBox">
@@ -351,6 +352,7 @@ export default {
       popupShowObj: {},
       questionType: "", // 判断是 单选还是多选
       submiting: false, // 判断是否已经点击过了
+      isSubmitted: false,// 判断是否已经提交成功了
     };
   },
   components: {
@@ -361,12 +363,91 @@ export default {
       user: "getUser",
     }),
   },
-  onLoad(query) {
+  async onLoad(query) {
+    // pageType  1的话  就是将缓存信息录入 没有就是重新开始
     console.log("query", query);
 
-    this.handleGetModalData(query.id);
+    await this.handleGetModalData(query.id);
+
+    let CacheObj = uni.getStorageSync('CacheObj')
+    if (CacheObj && query.pageType === '1') {
+
+      this.handleSetCacheDetial(CacheObj)
+    }
+  },
+  onUnload() {
+    // 没提交过就走了 说明是需要进行缓存的 
+    if (!this.isSubmitted) {
+      // 巡检内容
+      let inspectionContent = this.uploadResult
+      // 上面的巡检图片
+      let inspectionImgList = this.imgsList
+      // 情况类型
+      let situation = this.current // 0 正常 1 紧急
+
+      console.log('dsadasd', this.requestionRadioList);
+
+      // 把当前已经选择了的问题答案 记录一下
+      let chooseAnswer = {}
+
+      if (this.requestionRadioList && this.requestionRadioList.length > 0) {
+        this.requestionRadioList.forEach((item) => {
+          if (item.choiceResponse) {
+            chooseAnswer[item.id] = {
+              choiceResponse: item.choiceResponse,
+              imageResponse: item.imageResponse
+            }
+          }
+        })
+      }
+
+
+
+      // 需要缓存的内容
+      let CacheObj = {
+        inspectionContent: inspectionContent, // 巡检内容
+        inspectionImgList: inspectionImgList,  // 巡检图片
+        situation: situation, // 0 正常 1 紧急
+        chooseAnswer: chooseAnswer,// 当前已经选择了的记录问题
+        id: this.detailObj.id,// 点位id
+        title: this.detailObj.title
+      }
+
+      uni.setStorageSync('CacheObj', CacheObj)
+    }
   },
   methods: {
+    // 将缓存记录中的内容 再赋值到这条记录里面
+    handleSetCacheDetial(CacheObj) {
+      // 巡检内容
+      this.uploadResult = CacheObj.inspectionContent
+      // 巡检图片
+      this.imgsList = CacheObj.inspectionImgList
+      // 是否异常
+      this.current = CacheObj.situation
+
+      // 把缓存里面已经有了的数据 匹配到问题列表的字段里面
+      if (CacheObj.chooseAnswer) {
+        let obj = CacheObj.chooseAnswer
+        let list = JSON.parse(JSON.stringify(this.requestionRadioList))
+
+        for (let key in obj) {
+          if (list && list.length > 0) {
+            list.forEach(item => {
+
+              if (Number(item.id) === Number(key)) {
+                item.choiceResponse = obj[key].choiceResponse
+                item.imageResponse = obj[key].imageResponse
+                item.showAddImg = obj[key].imageResponse && obj[key].imageResponse.length > 0
+              }
+            })
+          }
+        }
+        this.requestionRadioList = list
+
+      }
+
+    },
     // 新的 在外面选择答案的内容
     handleOutRadioChange(e, obj) {
       console.log('eeee', e);
@@ -422,10 +503,6 @@ export default {
     },
     // 提交表单内容
     async submitUpload() {
-      if (this.submiting) {
-        return;
-      }
-
       console.log("user", this.user);
       console.log("this.detailObj", this.detailObj);
 
@@ -517,9 +594,6 @@ export default {
         });
         return;
       }
-      console.log("requestionRadioList", this.requestionRadioList);
-      console.log("requestionCheckedList", this.requestionCheckedList);
-
       console.log("haveError", haveError);
       if (!haveError && this.current === 1) {
         uni.showToast({
@@ -529,6 +603,11 @@ export default {
         return;
       }
 
+
+      if (this.submiting) {
+        return;
+      }
+
       this.submiting = true;
       let extendObj = {
         uploadResult: this.uploadResult,
@@ -554,7 +633,6 @@ export default {
       };
 
       console.log("req", req);
-      // return
       // 原node接口
       // const data = await this.$request.$webNodePOST(
       //   `questionnaire-responses`,
@@ -567,7 +645,7 @@ export default {
       );
       console.log("data", data);
 
-      this.submiting = false;
+
       console.log("data", data);
       if (data.Result_Code === 100) {
         this.submit = true;
@@ -576,7 +654,16 @@ export default {
           icon: "none",
         });
         let _this = this;
+        _this.isSubmitted = true
+
+
+        let CacheObj = uni.getStorageSync('CacheObj')
+        if (CacheObj) {
+          uni.setStorageSync('CacheObj', null)
+        }
+
         setTimeout(() => {
+          _this.submiting = false;
           _this.$util.toNextRoute(
             "redirectTo",
             `/pages/walkAroundManager/statusPage?id=${data.Result_Data.id}`
diff --git a/static/images/revenue/734100.png b/static/images/revenue/734100.png
new file mode 100644
index 0000000000000000000000000000000000000000..02db6d9781b7c71d5a718bd386e0f741f16258b0
GIT binary patch
literal 23131
zcmV)sK$yRYP)<h;3K|Lk000e1NJLTq0077U0077c1^@s7+Fzas0004XX+uL$YePpv
zZ)|UJQ*dEpWkhLnaBN|DP%{7kD3NuLy-UMT6va=gQqVex4jmjai9^)V3U+a5D-=aA
zR0XS3ntlmwd?YDSaT8Z5_#aroS#Yq3RB&-{5JU$N-JCipxM+CZmsHv!-pA$rIGl62
zT)-Pp87uYzDCw4wOvI$M)Vkz*gNL3|s%EmNqAUvj{k!Y)(e>U>h*?d$b`aT5T$j!+
zmv){4Q-A$k)t||l8vWnYL5&#};E{=yZHo!sB_1(oDdMW&yvxUe(=MMoo|R;r_?B4G
z3TlS9Ni3&3^n3@Gie;^}gV^4m)mN9r9O_ZbVG|}8icnF31O?%L{L_v<jxBOmU{EfP
z0xZfzNf8sW#PiUhVG=TN2tn$QxO3}%53T#jZEf!rm~C**FWTBd12~<blhxbWcmx<4
z0B-6`HB?9Hq4wr-!21a>m;#3HD6?Va!XbBie+=k*;rwF^@ErnnmGiG7&g~k7pMfj=
z2Nx-7yi*22%K!iXIAvH#W=%~1DgXcg2mk?xX#fNO00031000^Q000000-yo_1ONa4
z0RR91$e;rN1ONa40RR91$N&HU0JxJMuK)l*07*naRCodHJqcix#ntm2dmp(kAP^wj
z$dw=>ia=Eq#d?8N>(SO?tHrj~9v-c+tyQbG{?^uNRjgWTrS$+sK@=241i~GzaD<Ti
z&TjVpj{m)Hvzy(`9^YQc26r^<_suu+X6C(lGjHC!c|%C5hnlkSuKnc`4o9jd8!17k
z?~P?+MVbi2Mk`K*O5=%-sgUNfQqcoIk&!XX^Bn4z4)q~ad^5Db?^|nYwcmS?m#7Lk
zUOvG_2;~QcV)TCR!Cs;&L@)B{en2!#OTV~)2-$@+myMIqWXUVq?+c?tbV2LF2ib)X
z;wHtI54TM71*z2=c;EM6&$0@so9QODQ>_*Pf#_RX_5{WSzRM~^LA!}v{KWw#5P(9h
z(FVo^zDF!%-=*h29hk}YU0`%h-}hk85evz0Zdi#KSvq)9laj<wc#5K6@Ziau#@F`}
z$|4e~+m9LV-toX27_ZSD^^5myQOIE>J7@plj`oog3M#$HrxU^vLi^L+il0S}*sKNc
z;9G$VFV_Ys#GSCC-3vVIgN5keI}}a=K_MJ>L0&|UDLM2T|C&IhX~Y0cj!ZuXelY|5
z30dA6LL_;9+HcDV$&tQgXPZuAoF_cJ?ot&#dkZ;HGwdPHN1d+mMFdzsql`3{%_Nzu
z%k!z<uX<#zml=z)x?lE9aMzL#9QYpCMk$TcqInh{Xdrr|V0Eda-lbNya8<`uUOw8n
z^XJNPXd?!nLiz|5SZ}I#NO5QJ|M!v8cRozWU$3$IaEmBrFjA-NP3lvKe`en|WiQ8j
z;;?-syEYN4XvC;%Jn`;nz=*xxFL-I<7aQ=x_x4%^sh>$GvzT95=_$aS5}+<xw6TN`
zV*vO7K*3&{V0gbQ<DVj-d!U<Pmkju$I>m}j3uIxVAAGgi3>`lJVDCFcOya~D@15H(
zlbi^ps#ByX8w?xpM|wn+$}Fn1H3#R+`M_`fkOOPzrSTPw!qr|@?+OG^xp3}tZqW#b
zoyZ~To^fb?*@kRW>qUX0QMjU_Yl$c_*_Li7Ai5A$A<gBbIHpG(WTUImNB)hr6xl72
zoiIoZWaY(W0_N>7WNz{Zc|l->jFMFd-792I+Prg7NJwEmL@cDCtW=sQIC(4)w5W)M
zz*MKeoIRIbHzFtm8IchS@xYky@Wb_<=V*V!7IJ*{q*|val3kYJgk{?RVdnlwgGmgh
zg~I&Z_k=1u=u8H1VG6avd>A;}6OdkJ0W428krY(!>Ib`YRKqjJPEC@;Tm0zPk`W_!
z{*sU`k)pbT7SInG7Do9<5WNYGof`HdmTvXd(5H}2v95O9qkXl6ClKzg%K0B@J!fp0
zSGe=Gq8Fl=2PO3iem=F}1f_R0>3!$|y!N7if=4kEUPP*C<~T`&Xs|LzeDceBRI0m(
z)9y|xwM3y{CAnFO0u=y;gG=T^tK4DwzUIE~p2&W`CcjSMw2$hob+2&ea_LcO_6x?A
zrrUiY`~Z03QRt)SE>RQ^UT+c#I7`%f3&6BKH1TA0|Eh^73CsSm?zeVcLkf0Pl6>e{
z?gHHL!-gMxIj{iy;w6qdS>M0BD8icEuR>C-3o8BNFo#rmK7(oq!LA`&f|*^g!YbH>
z%XYU6=38t0uG3mU*v_CtC;;DOhl>|(gYJq%3?|%}M1`U;D19OpkZm|rLlKKefrLva
zt4M=bs#Z3e^7428wW1<4N+SY3(-K5SuLQJy<DEC>Ox^ZHo2TF=R(WLlSBECX3pym1
z#0xku|IYJf?k%>Nrjc!1;ghEszyzG@tH89eyocq)SO5m**>Uxf+Z$(%6^m_VSmg9I
zz@1Jcj8c;qm?xI^q*A0|))<jFbrk9!*Z@yeDdKXtdS@I@Tx`Edp~!*juA7bPBUBbd
z3>u9oVj39<65f!ixidEB9jn~#?naRt!il0qMm-}YNoYfA=1x4G>+HF}Q>q9PenI6i
zXiez3hi4f{z2wOg>u<sua_HRhPc=?%jBiB>b{>lepVn%6eDlQm9I+rdfVbSZ{JYtX
zuKAv{C~cmcI4%Q(_0Xi~O>FGytn=iH=Qkk@8FzRWs6+dLCBxW#&c8m8$HXdCWJc-(
z9r7vehSZmhbp+O=^pjngAxjMS;8N-$QY|1$(AT&cvi*`vX0wD+`a<q9W`5@T?tTtz
zYF`SQ)fRCdtS@!wr_d#Y&g1>^qk@OUXIg(q7+8hyF0Ve@``!H@!1@)n+rf*v@z|fq
z#%?cr;Ububuo%XGEQar+N7r9<{P^T|q{tBe$eP)wO#fi<!KxV_ik$z3)icd*s2+86
z&@v*>+%8Be4sTXZBQQb)p&#3H{P^&<VO=4mp=mo2go1up30jOOE>jY^89=xfB~^RR
z?birz$({%AEY1=IYjHBf@m<iPE8QC`{mSjlC6brs-VeJm?ln2?9Go@j$nOc|-5&8k
z_x=h3toWpQd84EUKZ;Bo_vNjJt0%AW*2zDuBs0;pm9R|fb;r-T=08wNzZ5-LC8Ne}
z+*s?9t(l}qyDHbKsep0;;Mu<hp!f#?5h*YDQRHy-q*cMQ(fJbAL?b2eh17{BHf;@T
z1m+vFabwhT0;4aKcA$LAoik(SJro^80fmVu#8UrtuU|uewDg=gr^*>g=iy6U0Y(<o
zwseaM*o*kjGlviQ7A(QXGDrZ40uu#!7g<44piG+Z<=-gMDV6cno^g+hf<LvfyZ!Kn
zQ`tnseZT%8Xk`Cn{xJ=+O6?3q{B$5R$WwWh$AiN2-HL!cB>0afx1PM8Z0KG_I35ue
zG#kXjdPUj+&JLBpTQNT#@y14YU@1`v1EXImmhvO6^bJNJ7(FTR#$%6=P38rJNBvLl
z(CW^NSoep6m8W4O7x+vBDEjsbcb?$?_AfnnI=@(;zhCJ*U`>R+%aW4|D5?j_c6Skq
zGC@td#f{w;6JCIM)2|U8kO+z*7hbk!vb*nR0w1E1FpS9T$r{h^vSn4u37Typ!=PR$
zn9e9v9Oz>~1;i-2#Ny($7spcv*?9qR^w`nce@C;;P`FvDfc#2Z#SHza_PKL+d{=gX
z>4a$vq%q)!fv+zA#@yPn(P9JWyZk=H@e<QK5=VKY;p{0+y0Jz<!L$g2c08c`@(yT2
znr4j_DIWE4?r8|5^n`^0YY28DTqOC1#L*+nev)s2@jjoJRT5O|7<8hKv9P351St_p
zbsElOE86xXwIOw7<LpcrhNh{+6(5t(C<j{y7tDP|K?FZhKQJGvR1+1F(-08fv&}7c
zdPb*El}%*VN=iejXN}?g$EV;;NgO?rFlz0&bl%fO8f_vYH-$>zu$6F%6ty&ikx1l5
z1gBB#u?cO+k@KhdnR^I;ahui<(r%ebV1pCd5RJt$-WR9c!$*Edg#MN{o-~P+wG!5l
zs&l3u_1z#qTe693H(lzfbg<u)WcFN_eVi|EI5M(ovGU<6%Z2?Ktm&cS5<-zZ3+MeN
zu*w}Kp)_={?k|c|<B@{y=7)T#fg23vm6cwdZm0$Y=n_LElNBE~MZ|Sat4P3B;qju0
zzmQXU+=crT5;v^c-~Z!;#~KykB2Rqq-g{5_lo9eVV0jWUotzJGH$>yG4f8Ds8&V-t
znVrCiJ+z^oZ{<QgZ~5U3S%DI)HD~w-q0$G&gVjS|RLt*jQDo%aePE*0CyrpX8Z8;u
z$*qkh#8ED}`F+#H)eyA<=MMjH-WO}kelcReF)g2uDKlz$D#C+0#Kbe?ndWPVPJfc4
zq)j2%aiV&}=5BpRdn}ql2%z+qOrcT1T_<Mh_idU~x)#ltqY5#vHSfFlPv4sI>7}H@
zQA8M4Bs}LOZtp%dR5Ah!2%c^!x>3Tr45Z6tSkQHBR3+??K|?rVG<LO_Or@~(7am$v
z4Vg2i>b%OG!?tj+Y<gq^50Ks2d7we45K8fY>815Nj=@2h9$_ko$&{B1jS?uDh0Py5
z3(14-{dmzBsv=MZrPZ9Or|3@ctFJ~tBQOgtQlr8_Q1BALf;J*BIg}^xU}4<K<z{}q
zFz_qBhi!<G?c~r{-fGJnCJJGb27?_j4ta~Bp@Lup5TWO|VZp9fTi02iELgCh9~Ohw
zE-R-R&IojiP7ZhTq71N?NGY4w5>ivVfc#lepffjwg1}?v60#{#vSi4l{!~$ylaWzh
z3oQ$kMT+0P{a^j$xPG0RhC>zt=WkXK464+%p}<_Gkvu#4UUGpEEZKL~^n+J3Z)&T?
zZijx}KOq0)?yT;Y2YMTv?d$|z2-P5D6aSrFe-csc&<Ou1|Kb?}4L$PC%paNN2nT1Q
zM%^<oiDK}4{c7n4(39IQ5)5fTA*K|}4kvB!|KfhrY1-;70S1KLCKnbS{tpRS8Q^wE
zReI?^!3ac830%p<IpnCci1MvQ(4hp%^-U94DPIGcz;6y06SNW7${y?Z;=uG?G`4l*
z1z(neIhH7BsbfA86eWm8Xr3P|(8(S4i|BpvPZf{?`)AMq=TbxLu;*ko9EEKC@Z+V(
znkT*rJ_CzRnDFY`e9MDUy!kxwCOC%RdG`J7SEBF7fch-GaMO8sBn7O${8D*dSk_M3
zJ0?!>y!-xoE41XUC1Bi=LFME$9C4pw_f!F9AWolyXE7+&EE+Nno)CiU&<KL~t}kHE
zb10nScaJ&<m|I0rUE<n}Gq(gDAo0LaD4c}j`rB!FzI(ftC!)Q5Qpl47a3Y_W@f=op
zuT0^|1iyNU>VK@u=X<b6yTB2pvXQ4K4InghlQZ?LwOu`>qk_Tk#Pw^4=R>I9>LugA
z7NdXA2&|uS&XdAJSI@fx(BH%B$>e>X_KGH9WO<k@i^n$p@O1T*zkBkB`t^3LPzeI#
zOKVj@Iu@LAVjMw@Ec@`xlV8<;mrUBX85*$#8i8Lz7mu=4#c!Tw<TL{77&S#Y)waT5
z73gjk`WcX60Y_}Z#KpVcgc%MTRtO$JA&^d((j8DHEGe#j_~hw14^&imVk7@X-H;BE
zy5G=;=8z?@%BF3cOE>4@-B4-hPQ2)8M93^eXK1Rom?w-lc{+5OP+vmRHbf2u5$F1T
zLTw?gE9!3lmWE;5{)>w#l+!q;W)4h1y?o%C!~dCr+16;Zz#)?i3LD}7RsLJl6aiwO
zs7h=wVO86Qkt+_p1kbSUsbo5!*6=0x91yHZlP4a(=iuR4PnzTzp9cdGd)#9sHy@?J
zlvY7?NSK#z{)9_fi<p&p_!RX0sCz=}HSWzRie-wN%!BU`n6TUinr<UaSq-4Tb{O1U
z<QJa&U)&Xm1;7n={%e#*Q{6)mU~S3p%zaKeeC6>JCK#!)En-&ok@uD@TNatSW2s!E
zJkzFZyhW#P5aECgRLBaWyiNLZyXb(^oKQ)Ic8F@tX;H1NuhSbEJ{>V^|MyBtc4t<g
z>1aBnF_6Z<8G!+Cz_Mq_#lHe$a-kmVefGH>5y}u%2B!5<&+7wItpt}+A<{=S&HFIR
z+<K8%J{Euj{^5VL0swVH$`AuveMS>x-^B}V%xJBBMY(1in8tvbK|*~W{(&5zHDaV6
zL`EuvGm;>O7R=tHGqo>Jwb#M=4+(%c$IwR%jKhtLe5dUN=~IgQb4H0rhv%1l+*CG3
z%s^sz^?pbM&z~>W-EkJ8oaY-m*w1GKhwQxM{FjSb8gF4Oc-)dEaPmt=Ky@#0iAFIv
z3ylyp9MS~Yy5iQe#_arTFV))UQM-m{X0T|;0)*3WGW0sZvL`8S$P(oEoT)Y1$}OW%
zjTC#JiP>%ms!)s_W_&s0X-#}3$C!KTt+!5WEE^-}INK;+tEyPQp}Da>#C}*T@Dh<{
z=nw>U^bRbVvwF<_&kq41yi;~ONI==krKAHkQ{#acf8HT8WSu@|qDjT^dbf3(tXW$I
zc7P;IV%+1%C`?w8l;@DOYu9SQ--?UnxC9f!EewOJz<wqmvM`sVL@7;>_22ncaoIyZ
zF@fJ0);(YNa|XVlZ&F?nbW1iO%5ccCiLUgd9uZTJVDHM?&Y7}j$0<fc7nc14B2$2W
z8ozaS5x8CPv&HD2I(Q5c8BEaJmWRQU40voxa>$meu9{x3b@Nt52r-HWLMTDpJv9IF
zth0Y{XA=xQz${3j=mO41O06bMkZ@?*b??f_V{7*9f>pHt_~erb4~*9?UNmCiQ%|7{
zZOj2Fp;X2;+{IjIgp4W0AtzUDQWtDoznekdH9_@HAg02c(LV8<nKK^#d%dS^(es8U
zClI8i@j&0(;6J4lK@`vYppg~OflWx}Ag#kkt(x-s>w6M`IwT~^)94H;WkSjj<nX++
z4$-2J845EvymTrRtuxksa$Bf0(Z(a$IgPTP|L<twBr<(U5M;;2^ZuA^w@qXMPRjW<
z6p?pi(%iA|o3Ke3VX8zXVeowG8|(9+6QptFy?KT0O?QXG3VKRxC@B2#H(z?m|AbSl
zt@g<WL`kWI;h?Kd>|ecGsg>O2`(P>H(E+o(Fv9k1Ky=)%c>2hx)em~7^liwXR%Yj-
zb5_!v9gY};k(0omp{;z*_2th;KCSHAFgec@NY;YW(IY4AK&2Txf`B>BD0A1NYH2?M
zNAvyx$<#wDUCoD2|F{3wz8KhQf~3J=^rh<m#3F~}<wm~zvVYd3#SGezb>zbNuW<sW
z4c8-RSaUdwGQYp@{mov{R1_=NrB{{Bsy(5Y$UAc<HPsgubX%^;&@htKade0R1BgFt
z`{qvya-Y70p;RquLrb;BP<MFgr48F3ee{mb=zt|Ab@bgT0p(VUqETBuv4tis6>bvk
zv5qAh%x9A|?N^doIIRpPg`mTOIXaxXz~hp5QdAn&f{ttg**0Yf8Lh@65z#dV)mS$k
zeVTk^IzLFO5EdTQ#804PL46H4X~m-;G#s$aF6dZalz;3`<L|%t<JHTfFfvDQVZwlL
zNEN7zZk)aGf|J!bk6Ue7)5a-V;R=Wyz170e1{x29=?m}-<GULP$V0y0`cg?x(b2#^
zGl1noirQEvbO=9tesIkS5+9yiXlcw@jDLHVgJFeKf10og8_CJ9d%me|=A97b<!b*z
z!@q?aF~a8z@%6{Iy<3o<v-iI$RX0!3t)Q#z6sNK#$DW<DH*|N8neKAJMWZhC5rz%!
zMYJC=LI4gG4Fm~y3OiIbEF1CY@*cnmoigGVss23STuRbhKV}6SZgUZ;4Xn}|xyzTm
zIXq&1p9FDp$kfsMe^%X;@rc8rfnzW#@_#S%B3UZLqqy^p^C^8$ACa{LICmISyB}xG
z0Jf+gcDsUk@4uJSQEWF+GAG7695bsU0gjp=Wo0|hJ9sd6gWX}&;F|fsN#6z~6Y<bU
z+6nR$916xB3GTdMB!u=MVq*&;AnivB*4^^A`n)cascWL$nst`dnl+gh^fOInyaEmP
zu5ihUWyDwx)D=%?I=JCSv$OWR-_bea@^H14Rm$wy+vo4zUAmFu7&ys}SrUtQ$z%Zr
zPmO4W6TMo(2t7or?mEcx)YDd%u$qw7pk}W?%mfW5&z;()b=cvYZFB)|JU*ftKKr~c
zHt&p-^QS-En*HL7g@;Y1tlmS*F^u*gA?y_HR+dxGhtv*)B}nnGJ<ptOD!3EO`=GvI
zlZI&z5)bpjAB7&XoTNl`oLrXm9=SH>6Ea$Hil{)H<bbpCO8AOL`Ee((L8~Y)`}{Dt
z4T&7Wc_|2&n}sSh=Zr0zynemxbHuCuyejj1KU>x&2;k@?ngGN{yKa}u|7Phx5J88m
z#~)v>yZ2Y;wx4bY@1ZjgnDh>}Qc~c8RG~8M7rCw#F4y#Jo^-VrOm9$_dy3qB%R^vj
z7mVXD5cLL%C_wTt6`ck99fv)UN%_T*&zc#XvRC($@0i)2U&%Rz==^q2;5L8C*kd;V
zT|#m?HZmyR-S^A0PIG)T#1M#zww^91*rq3NgQo~rwmWU3ruh;B#(hd-v1bP}RtUs4
zoMW_&*u6XH3o~?{n5oo-_O9qtF}yrs$>QzHzXcMMlcU1AlJ&{veuSZF=8W!d?LBh#
zYyG|jL<HrK%sk8S)@Dt42zmv8fLFLVg;triH8)=z)Tskz*#6_2ZWTm%L{<{!<V(kn
zh8$=6S0J_+<WZ9lc=?AvEZ`z`_^8TF6x(qg;e+~;@Xz3V1L$Cbr)C9*%~7NQ&X6_n
z2IY{}=5ezR9jeSVX4ao_kNw_Kf<Fj)VzUif1}8&d&D0~Z%2tu3I^Q9r30*}=p=kI1
zZ}>0%JYRzSa@#5rxbG3H1dPM=i&@d%E^E`KRqBG=gF6YVq2M+SS3_+n5F=>c4GtP;
zp#m2UKe_AmEW5KvEtePwEMzH@CSBML-%BtN(iVCOJ$1tFvi2@=ZI3nk8oNa`h6mdZ
zbX<cf4njFV+u;&)T2no(7B^)nOl!-}-%hUv83_YJn8nydpsry9b|e?gtP7hc;A141
z0m;3u=qO4x0({fJ8gcx@qxYXWk@Jw#Md*bKv7aJT{FBwOdtrjh6SaxI_gCAr6&1^!
zPd(Ke9mP+qZHb}?LY`Z(Lh;Sro4P@K(nKl{rL0Z|J$d|r>O*o1IR(C;)FFI9`NF_S
z92LV3AjC6`-z85re;ZUG8NNwkdxkYpK|%Yb=B9sL7*0Hw13V;$$jK}>&3RvZK{1+e
z7lHLb!nFY-@|M1s$WMWN7~ipvqsI&dNH^;`XOUkwK1dqD`2<)s5SLRM8EDuPSOQOs
z8f(utuH7;Atyfw*DeCrw%y|Ps5RPFKqR2~EaD;6qd_;GCM$QzKge3s_9Ux8OEoK|L
zXOQ1E+((YuCW814t7H%|(T)q#NI{lN6}*<{2T!B4IWN5U<g_(w&O6c#4i+e?SfpMJ
zo<5e?0U=1f(sB(*jj|R}xG3y#=%Kf@MQo2&RsBPUsC{7km+D*rta(JZti8`U8W5wG
zb-cug2(f<xJT;x2RbTn+{rk^fe)n>l6}Da0tZ}CUYV?-SKVPgdz1=3(?DF!tcyd$Z
zlz>3^&n}2PR$Yy>c!JF+seT61I)P?7{!N417mDeD833do@ONf)<o}I#>W6Ux_{!we
zKE#MzTK^QdLV`aaY$lu<om<{MM-*>UiGq;=Ph#arjQ)8N9}{VgO-PCLv&QU!p=i2W
zYVik&T?`3P@604Gwk;*EcYT|f`5f5m23o-I<?ZJF+2Vi0tz*#ou}Yp~XLPJTXYQ6|
zYu0=(;Z`ltR&+pyELfa4f%C!n7e}^PCX*-X?;u}Tz+)A7Dnq1DFq%mlgMmV^XUvJV
zRleydkYhnLBcM75E;QsF)?d$_v+?DxzWR0@3~wMqP(n*<-!SBx^^AB%nZBZ;N?$x`
z=i_?asW!skO@VObq2xFjpOgDXF->s8XNQ=Zd-T+V(l5SQQQ?`*hX#6M9<l)O%;X6>
zmo_!CzcgEm&ViFiAklz|CkdW@`xfmurC^m|ng&}ft)X#Wj@I<r<4^tZndQq@56Bpw
zY_f(W$R^O^{Ak8!-{@$}dZ4v4<2=rlEiJ6v<9fUT1{961l=0$Q*mR;`vxov$>k3tm
zNl7`Y^_jIhOGY~1&dtr*vSv-W9j248TGC`AYM|f;B?xqOTn>0Q>5&_tLYS7i{r0tr
zqhHLSHTrJouGz!|N04AhB4##I)b#MeE%z+vZoPFgng$>OK~VpCAQIY|4rvUeF_6YU
z8Utwz3@QeKPU?eNqa+tzS@Ek<<N9?QbPnriyvn4K(-kk-x34bA#mWXhAS-p*wMlZq
zqZgE|R<3#DS~aZNQ8vT?f_zGauLVK2ExYQx!jn~-H9g&o+j`o)hQehgK?|o83R0a?
zs6Gj=%Fc!7yf*&CzAYLN?Wp=MX2C^zN`*6*Ltq2uX!*pQhVGVGF3<QBfO;g4CdF9f
zj3mh3ii-T~b0*huf>S~J-R<F#VceX8CahXfOer1M88>9@zwM4m+3&yBpm4bq+6cyl
zXxOT^Y#;PJ5MRbUqX_cZ^*2w;-nIS!E1=1hXTCtL@cen2?tVvQTMjb~49HU_oG}FX
z>}NllJg)jnFq#(eAe<}=V=7C&BBh4yGlC$eEB=%{;j?%4*})>6^`7eW%om|)!}D<J
zDXT~yI>o?$NvYluZSyO@2x8PjM9F^ed=qSpF<S316$z4?gK(3}VTD5}DHI}iqZF!a
zzpB8k2Q}*^cPTi|z{(~DLg^dQYM7GTIom%*v)PmgLwd+M@Y$Rr4CjoJ7>M`2NnMYZ
z6Q@uZvIN=njd{P#?dmKAbMKe~ZiH%WM^b8Qct{dt*A-XKFYa!B!0o>>c8aJ#0N4{V
zIg^ud$PuIh=8fF?10TWdII&Zr7neL3{>~to$-!)lP=}n9b;E~e?Pm!e)(xOsT(~4R
z4XH(tA;lp(mR|T%t<ySLmesZls-OvLiZRI0vFh7a@tU!u;nW{tYe@#G<t0&oa`BKR
z?YCDRwgOURfAH8|ClSzIEMWnGF}bi@PoXd*hOFJo7T=J;SxfpRyu?t&y#OglA#&j1
zqEruHrk!6?v&vmfBt&9};f5!Y=H}*<!a&Ls<nW?}Z_@(jaVwNi<VhDxCKO`)z*3qZ
z;0Hc0qq}yg9PbaYp@Je=Dpgu_A{TkgXPei-HfzXEgAST(D)3bT*5I)Qo4PIb%&`_4
zCSS<LhRHJ^pSIljojHYeds!%{O2Q(X5Vb7&<_}_Rgq!mQq&cz+iM1`V3y3x0@IAZU
zfQ4H~4<YE2(v(y5xoPjF9SNQ1W36z4@}(p}wtnyCvniWtRJb;BaO|X~?7YhvaGvM8
zzY#7^;5X#5PJ3=5#kRmAqJB?Fg5)0D{fZV2h=;-yBGQtXx1s#8$GYRTP$-HTXGzVF
zas=6Z`|aZt4$Js(t;P+E`qJsk!=;h)4gF=AY?-0xE(b)y)1(|hv<J7nt%-2yd{1uC
zmlr+%Jl;eccPJ=Guhc^#@z^~T`39?Xg1gHG@3`nE(J=QLw|RiX>hT4kqm-rQPo>n3
zVV`=))51agwQqm-Wj!bm-BsvM5DwNGoeI6>jf#r6oiXA(gkG)3e74$qxOEVl?kzfH
zhO9T=6q$URb)L6oK_1XKzrCdJhZTJX*Mp>z9|dYM`H2T8WomE;Y{!ndXzmJ8;Edre
zMyC`CvacimtwiAl4vQoTRKnn-28VzluEApdT{ulH4l!L>d0TJZ@M=`f&B9^Iz4KTW
zF3Es@O9_H}w(OgewRT4~B0W?PKuu!JGX6N!_gLbQLsE+zDY74u*IN6ef)YY51aV-o
zDHL2&-q`)IAU;%{&`ZxyIg%eg_#6UPA7xnW=Y>(~N`{~I?841U{_>ZE-s~KXBa@H%
z;3W(?K@MKIaG?v_!UeCMTT4a5aOKF&x+hecSmSwg;+0}y&<UbwH~l`6IjB{sAWhrs
zaj!iBagWvwvb_BVW=!Jypc5q1VVO#cp{s%VrVhRK;F4n>By_k!oC=}$zLJRY@SsCu
zB7DAte676d(na8U9k={K!b3^OSTykuArr*$LGs8QNB(4F9aMs7+M9j`w}n8v!Vv^^
z1q~TdxgM8`C_IImYGF_bVz8Rejf4=+m?fT7a40D!Wvwn3DKi*C_l8K7OTza-BgoEs
ze>_JaP~dnSdui~Vihdm1U9R<1#pa|a09iQFwmAt%jR)kQ5k&d<7vBa)i(v;10q7)_
zOn4z&16>6741*IiTt57!P%4SRY>q8+B;YZA9~^>!GSR>}ua1NXysNg$RKFoq+wj&K
zT8VB@BS8ud0sMyZW<zC44OxSt?L`dKyKE6XBRN<Fahc%yOrLQ7@Bdo7{+)3%Ep}?c
znBrsOr_w(jzbfx8ND)0zT%3x&s`BVN`I)3mqoZpTnv(}IhV4JJbkW^a6%~WyyfgY%
z_#h|N$2~VJUzmHi@)JA`fC1$!)GP7up8%FW&2XK>F6(siDL2ox&UQhasXc47Ai~`T
zo;wUBsSI{AV1sF*ZXek);bzDg{i%^|UQH(L*(Q}MxowgR?%Z`kr>wNvOmwXIw36*v
zuQDn&Tyfcl8=rml-l%SFkQx}pKZ8P$V~gkiPubRZwF-RpcDl6W)1GqjZpR|BxpOhx
zW7zA!N>Xd!-4bBdi!3D}%fDrP1i2+9f|!9I6Fda*2aN?vOh>_$ej*Ptg$Ng*;NS=y
z#$ask%**TfzXc0+zxcun->&PIHI9e@C&<(5E>-bA8(06Y)0gDzvCV+Sf?sw<4R`$E
zMJv(u@^}f-0|Xhr=S$?vkSKKDSRLd$I)H|obrcLO<QBHPcGjfBKi{z7YP_;Kt}q}3
zS+eA>g}e8j`=gGQoRu6=8F>LDBj0-&ap(%d0g+l3FF`suEt$Iai?9TVR0q!u4iw`e
zDpgPG_|k({?Ay1*dv{~R`~eA)CS_fA*_N!)#fP3ztLrT5*4@_FSU>uHhs$W>@up}#
zpdZ9Q45=LehC$gl>L87Q#08}2y)Zp$2;L06b%zUt2;8Ncw{PDCUmA5MI#%4WbF4Q_
z6b}g{2-J<9G<ExR2JNYa_t(wnsIAMn)8W#?g-_t)U6O(jdH9#mVxwrTe^R)uA|}rC
zhZ6Y45tB6|>-m3{9xEQb<Bh<tk=_%6nWvv#r^?UY`-(!<;5u?>%o}EFW)WWg#KU#o
zVjwp}s?mUa@9h|2m!)x31g;XqPFGh`c%4pj;$$?C;v&e^m%cV4JLBY+KmO@FdrQm6
zn>d$&7Jzk!On@61+{(>l)EI2{MI*5~vP+bzngeo6h>0LqT=9BAcFvK*Z>_)dbVqmA
zInw!i9ER{pv>_E>J_BiqqQU;rb9F`-i7S?-i7>};T*j2FjD3&F$sg5>h;u|?;l6*j
zwiYc%14B3ZW1^{?y7{ERYQn`y=qnByh=)c{3x-!EO;PV7n<rf#(>lb)sN27*f9~pr
z)6@vKa;dztJ9~=Vo;k%~&lv9Hp>=rkHC&ej7bQXY@w5|R0UY5&IElSH>@jTFs*|bX
zE3Z;0N59Frz%6uKmGi-K;G-n|VkAmI5O5_1k2Ksv4mY$N6bSo1NL6b%;;1YWo4HD{
z+_i3T`BYNNL}`uUhEEgT`SB<7J_mAR-+Emt6aImYM?Lh=0%rG)UoH4@N69_i-5D1<
z9J=1l+gmqJVp+dPOo|j0jk+2hdM~35o-rapuyXmihd)11J>p#VkmTlz;NW75r9cg?
z6r7SY3<?X9!88*G!~TO28=kQ^*=m75*XAkJ^Xu6QuM>^had4pwHduaerv*Oa9}1EQ
z`UPMeRsNed!sm@RGR&H`{r=qtCjOR4cNxbpPr`8S<n@aIUhD*^s93Aj>CQfFwK3Uv
zo0_}P(KI}uwa`*n*h<5W2&-JYvr0iMq*Qf+d@JXFWJ%^0GF$<RU7E8N?X3L)l;pvG
z0HD5Ck%z0-Vhm6dS$Uz_P>-{Jch#+*Z+qvJN$UZ(F(3h`Dk>u0`5KZ#Dpsu3KJtgN
zTO6E1M_?R{EnvM7r}zsnKtZUb8%eo-C%G~AEizZXk7O%Mgafp|(KPsjD^g)?U{z?s
zj<d1VrGGBG0rWwLuIT?MXw2I$pZ8I2?%vI9Z6ynXCI}Nrfe&Gx79zUm3Q7<hrgXY#
zCml{abByDktd7)I9ceDWNm%MiPMYrg+k&wToByKy-hZ=c2bAeUU=Te)eb`$Dc10XW
zRJ(wLvI>o1@bK1CMbqL#-Zyy<g?WZmZEX|~L{{~@Kt))a6y~gdyEB5eD=0yV@(=vS
zYRkxX_w48jCbUhuIG$2<KfqZ{e-uf%O8_Q$Wa`|RnJ4j<`0&ySlFFge;zhW!3Xb)_
z4q_@6D<E@M!$d-IF}v)58w;$mlN>zw<73!Y!-am>S+QcLwxv6FDV|7{9{_j24N8T@
zlCNt#kLL?0&N}{K0>tpZFfzl=g|)jZEGw+tTRi!a`75bTWEKFslkA(|q_L@U{Lf_e
z6)$95e2y+|_&yLLVkhgzA)jreE)iWCwHKO<2ZnYM6=VON)iv^^7B2|`GCI31bUQf?
zh!1#0U7=kR8Umt|@(PSAd#-wjP{Pw04RuZz-kup<P^+!n(PQN=$jQ}@Lo8NJ0R{KR
zMiY2}`4EW_E|0RMeO$Qjo^N=D(8ZA>p7%(<@ysDWjfg!K%isFuR?SlxM>{)vbfBYy
zX*G&~L)85FhsMaw(vKihXDa?nQBK)C2j>}zaa^p?>@N;isDk2T9e2fbIE;PK^@wl<
zhxrCOz`}zOh_Z0uCl@TZd4jpioM%KWfrt~LoPa7B*drM?p=#xZ4U139$%1M65#)mp
z#<k|>Gy;3!8C5_|#DG$fmbTkVYFW1FDMG4)vNS8e_MD7>D+7Velx@cw7v*ra4H0lL
zIHqLJhE1Q&-0ZX~K<|O5lEqNobR+U>UpadC+-E`*5j46VK`>QAbJ-oGrBy#=RSu9_
zvCfeQ13d>;OB|>9F-?!KD-^9QglV`EBzy_}N|C5wvC(h73RWXzacyT!SFmr1j>B39
zgSl}2Cs%8=^{x}AMqlK<Y&mGMU|HR9z<Px__3xi<oOMg+M8UrVB?urzICkuur=0e`
zs>V)e{DWF)0xcUD9Khrqrc+5J2%;SbqsSv-#@meQPF|%vZT`IU^DU?CI$0cIhqG%8
zXP4da<C#OCF{plU2UvSuchg6cGBax1Hhnhhe>R&z?yVOd2+}VM-y}cxz<-<Crd{s$
zLFP+Pf_U;$R0VhJ(Buc~&Jn8beRoq%adyr1`pous)e4gX3r4=7@jqBRuoNe%RXq-!
zzH3wQ@Dsn9HfHzSjUUd|IGn|Xf6jmE;Uc9R^IVWCVFF|LOf)x1dJt$-loE3NZLb&P
z<eWP4pI2uc?CRF%xQC`_xdP@EnkOTN)jrYEdj7IlD<5$f0Sj@dW-q?D94|C`qxa8S
zp7aq$HJs`=9QonT0=Tb*$At^s$sF~KV;I~ki8S&-avn}gIaTT?vEeQ!ntvHeAV<W!
z{IcxY!=0<t<3T3|*=1BPL?NIbCFh=d=*lfy=DiytiLB^|1d#<LLL!~jF$Gm3avX-y
z6m6YcRV91KicoaGXE&X<+eVUKoqB*&S!RIsBpcC!G5|=xD=17^Gg*3h&CGY+nHN!4
z6_B~#>wpl1v3F*nN<>b8!=HWQx||FV(x7gDhn}y1>0)ii`Q+}?j}kMbA#TB1Zmoh8
z0>TajqODQO)z2*dN9jB7RG=kC++jcnq7y``JpLfWDe`qNaL69Ag0T_^;u1Has?sEA
z$RF!&BCm9Po3OBku<-8lrNQ#a$0iPK6d5_Z?oTzfvwn_3ko>&iQw|706w=u-#Bt;?
z8usNr314OZuYpn)mf!?#*wHhd{G$H%<d~%t1O?a|ge?R|a4FXxV5B#IrBQXb=AK(M
z>61^E97i!dkzqgx0u>%BuhP&uipUYi{J?Rj2!%<ynad`RH{4GC-M$pMtQw+l)<Sb6
zOfH-0{9yOJ0N24*a>?kEubr6r@U5S$ULA5#*_S8!r-31eDC9^cml5iRosHu86A_ZZ
za!v$ed7uCUr;Zn2X<I~|X}X)7=Cg<bh#-JH7+5C&3FL8Q*zzR3o`UGL9UTi6?wt1C
zd&}#|v9LMf`ZzEIp{Oj`wS?t!q_jwk?Cf<TOr}|XS@<UPO<ch_VWLJwh<k1T5D}q7
zECq;46INj*lO{AQ-@kv_>i6D@lqdf0140n6ebJ!vF*yMaMTH#-X!b}2EoMK^(WwOy
z$!9K=tMrpo2^i>T#z~5X)%?2tblJoE_ZP{lye!z^6NO!=htDeS>((h#vSBC+oO^?0
z2Hgex$8l^wJ(g10@NJsz?xfi+7_IUi<OEdqfpm<EP0wEth|xvCd;>EyqqLF2-0oMm
zesNPq{ps@GOJiSjfZ|G>bb{ouVi9mhNP(Y+2^sr2t{2eQ!8lr1q9Z2?So-v@Sh}-;
z&}Px;)V>NTu1tZ0@l3iF9cP=w1RNnLn5-2_jtnn4`q<UqT*)@I72kZ$IUkr3Q$lo5
z64$a2<yOrsot#IL{V>4-@%tBN2ZZ2gv&l4rJkxpyIpCZEDi{?I31}#Dm<v&K=xCHx
zdtvKz9p;h4_kRE2kt<;zD6~30G_b^eN%|a;3%8rnlqkAIPifwT?Rt)wIW>8^a~^rQ
z=>~GdF&$`yx+IuBBrQGiOfrUTAOvND(^@Ra%;>C~HmCWTPu9&lb?7KW_wOr-#k5Rl
zNhb(_^#C|mf|av_v~!u{AI(e2%N;j^Lx3W}h)yv15{VL&u1=}P;s}bwNL0XC$p#$&
zZmwdqL`hp~8MgkK&p!M9-m<c#JZQ5MSy)0Uoz#8-IHn#cz2)3JrfFN=>-;8V6?1_I
z7MO<(fc9i?0OAC33@&Tn(5NUV;h0&gD?78{+0tQe|9;EvM_LntwIl*bI6;62%z5W*
zoPY30afQ`xIN#yWBW7SsfZi|BAX$WPV~J)t<OII3!1m9{XRZ0|x^?%QN+SMJ4>WSY
zrcImJaV3X;Va%wnp@;?CD|7?aP4L$RfB2k?KNFPG1h6~dWI~6SnN`y=ZtT&OkH7Lt
zbY>wbhSHchWYLoMM;)#l^~0_n=BIXNmJ-ZAr867-4s<4>!Kl6flT#_+ei=;sYHh1S
zYv_8nu;7b7Rqg%Jc9@jm!_W`12?Cs;C@Xva8%^~k4>Y$M=83#Unk-?1#}5m#&1C#?
z1-wYZ8{!uxWriXeg_$T6*1ehe{AUZ#Kk}ECS1mmTpUwyZ1hgEQ6(pcj7YO3~`A-(t
z)n4+QmUeQF#ZqJtCD#_7odnDpD^7ZgrLC|Jjq42nCFo%SZi0h3>XRCs>2PjA?ME}`
zY1h2*+`JQKO79PX>V8rE2=eW3KUehWN3);pG8r#%u{srJGs2t<8dTWpM$Dl*S2X$Y
zOww)#OYjaX<Owt=VkzJpnqdgd!h%=eoS+Xh3AD4Dp%k4Ob$gA-WbZaAx9-(C#_ZCL
zYV2ORbE&-|fg3%Zx(v17egwfu+P6pIJ2VOx2=wO7Cz(ec*}|wTm(nhdrd)<DigacX
zGYgi;Y^yjW+sOa;(TljrldDknL|TPa6b?0HrR$r<KpF#S45TrT#y}baX$+(>Ff=jH
zPv{+*%}CceA_l-tXX|&qGd`of_C7^N!*z^cSHkuy9Mo1GQ!wg<<G$Kg4>0<ck`V!Z
zJrek9p}rn%{@S#1)vXokIkp|&RkpO;ttcNq27Cok3RvVL7x3T-2Xus_73>)5++KLo
z%n_t#q!}a#QigKWyT5qMP_lFF-Rhq9ALbtTS3Vf711q?h0y)5K$%#62w=p^o%0`Xb
zD=$hDX(kCEewsl75Hb{BKYH%bjA0*s@e5t^soOLk|05rd0^$}PSdU1~!acn{m^_U-
zWIs3VLlFT<taF+{l8D@7gZ|&NX(MJRTz^tL|NK=7uyXQTHz)a33dRkA6~Z(O4K|9>
z6yo8dz*JxB_cVhHG4ii}{Bd30=J$VOY;C?jL$Da69bDWz?8gxOBA}&xJb;IraCcYQ
zc<jCSV2Gh&K&qQ&kO4t+{DrK&|Nh})wrqSZ<3BGf=6M$jUhv?E9$4eJ-3LTn0NAg<
z<N@wWcz(OqMh3;gKk7;kLWVSh3<A=lDRSS6ThG!QI`DVHhi{%^7r=WaEE?b-nq+K(
zvp}o?7wa^bKC4}>dakp1Ks=blTGzqMmu8T`#D18vcisM-$@+tPU(i*4J_ig4VXPO3
z#<R$Pe0{=FG+fe`7N1Z&b5QhnDkn!pYHAYVe<DnihUBL-gQOVQs_wX>)V^=$s$si6
zpUZ>K3EZo|;GQ$w&x!aK8H`7>Q$tp<JwIOqmzQ@Z0`8dxBh4TwLebrSuE<oqweD}a
zuQo0-iad*=6gsF#EMxS|JJ@U}0=UG{LQH&G#0t?5(hL#;F#{I;rpWADHUGYh*I&O+
z<Xqs25^n48ic)CSo}7TZf$I=~Rq2&RV@THl$tiv4Kut5qpwUXCKE3XWi}IhGy2|LX
z4MQ(pc!@=FL$ACBg`oBeed}rM4vSc4N*@#nf%r6ogg{I(qu*SyB4gaq+5gNx-gOxx
zh%6pw>g&46EV&Q1M|5+!94=bZ;4gdiCHvYxr5R*^yTIN>=UuPe{psIzJZD6QgSZYr
zTd9E$ST+SWPk?i)9&?&OLJ%O$AR!Qw=;)32-B&PT^M<!Fx*N}dl?Cz!1nifC!5r@O
zhYG5Jw-Q#RkK%?TcbY*$q9$=4wqJ4Cw=+Nd-?Lhg)8p>7`&@bA;Ku?99F`FqT#2cr
zwPc1cq@BUU(tO!@lBXt-U4=6@;hTSbQ@?M~oYjT(M^+grPOkuL<9Z{d0w@PE;lFeU
zj)C+H5*#ma$8Ndd%Cf>&A9^>#Wgq5}{Pws(4vs(-q&ZL#a3}<ho4}gakY<n|7?PsW
zGe{`R#1Vhsk_&%2torchI+txYbU})Z(V#GnDn!hRW+rMdc!W!cdp^qRO6c`05epwe
z3DPr20*UqFcONsHTm9eHvRiAHz~~HKXnp4k-{%At8Y3t?Q3!f0s3OB>sAIo<KE~pQ
zOtv(GB#2b|Dt<bK-TcOy3~TpfP*G9Rd5Z+WP8Jx{p@C&^diDr|;537TL5{pnBDLxI
z<?{^dKYl~y=oyAyLi-ltsWof(wg+p5rY3MLi_q-*A^q%!fi#2op(ENCk=lO4)i-2U
zAN_|;aA?4zcC-KnHN9l+?iBc}E)`BD=@0}1LyMw88Zc;4a3pWn6_?zef8xkrw46;7
zOAo_Q+zuHz=&1r~lm;+hX;?l7R}tr^+XlAq0c>ZyMWq=e1`Jk<qH6!O7yWTqOU>gN
z&Y8vF?q3W6Z>kZMYGPh|t;v<0BjV=WKnEUfII0`yLWfX!u~BviH89ateNz;bw#64b
zopbv19h3`hGsZq0MZd<Rc;^-cvj(Nn6UFqh@77f9SjbzftzIklL{~ZpJh%=O9LK>`
zgcP2dN{3JwNHa(%%mj-Ev1<I4-+0d0(Qp&TaoQ;O!Vel637R!3d&}6dHx4U0^=gi&
z0A&*1fQArbh3Z#C#1|Cla1ElOm13toH+8iM5nGbn1Zf75gI{2bwQJXE4_r9!rGkdK
z>(nCA#G>86u8(4rNv(2pjVisW+Q$5cs@Tl26x?Duz+Kc+9EE<d(jg=U(hL$3HGLnj
z2bDbY<b64&wrgmC*We}_o)!0Wvc8nTpD;hJH?S+(Sfz~{KH(10Q26ok)vE{ppb}hj
zM2dpfI~^-|%SfXkEC#?U`nJUv{4T4r=`LR246zKi$VkXkR;7wq#+2S>J6`i@`SZ_v
zZchtae6l{`!UM%DR>=~Rae`c4PgZqO7H)b52}c?bt*Wm2#+{|+);np=Wng1G+9V-a
zsTQomitpU6&Uvf6veJ(^{9eM<CxPGas$q$76+Zi#350*9fQm(wK2zEru^q>6xbjv-
zLsJFEJ2O%1gR_8q!O9IDbBJIR*fXN^`QzE*%inqa<)HqjVwssDHXuX-WDJ}^P+7oq
zTN<alQ<XM134yEh3=#q{pDw?8zUz2(1;shCJt9)H8YU-bPzC6T?K#8W+DEB=zV!LE
zaFOib2V_RPC&UF-#!9oPH9zBnw5m4*S<(y=1TkB`_r21*Qz!nEB{+vGq?yCbBGJws
z;BlQeva(LlGpF3Y?9J7dAVm#Y6mkUILJa>U+mp(mH8CLtrx_#wja4uFDO+>+tA7|c
z^YmV2RX~c!udw!&CL5DNWwDfwyKV2W=4#-xfs~>mSF$$+EYy+v(;)-~(hTB*n2I;w
zR61XH?a?9!ceX;L*;slsZoXlFd&>za9bHkY%GsI{>RflV{Qi~Z4y{UCM#}u+(=UA(
zNH5YoxPX!Lx+^dKPA1=TEhPwAX%XxB7R4{_hO^)Ru2Y}!(eaUIy?FVfk2<2rK43|4
zWP}r4xStctI51%K9PEP94AM)1%Db*Vk8Q5IpXd23i~^Aex=(b{2c|~GYFBDnsRifV
zcNtNqwnJ!?`%vGT4k0m+W)MKl$%;P~QX60Yozle@p#fj40oNWPqaec6sZWSib^EB*
ze@<!b5blIfv?BHf$BL*Sl<#Z523ZEqqkF!5=SLc+Z5AhTF%1~V1=!hG_}5Wb^gc6w
z+)GnduTE)?={OGXKz)i92jAQ!g&8KM4w1s`iMnbJy|w(3jP{NdyvQ3AxUh~v;J_i6
z6L?})X*+HD!p9GPRn-}FMFuzn&UP-GK{&=)8B3!FxW0o`+}C;r*;`SOFP=L53kAhx
zp+<)mV?zfVIwEl0IB|{~u`Y|N*`BIeE8k9rOAi`$_?=3HbSbXyxAb!#24d?Geffv%
zQ^h8cReZkj`#GF*1}s#2XVMs^55Rx|{!B(=hh1r?7_s`xpr$0LhA0#ZkwJ(OYo89G
zFz~fykmdiprd(m}_<@6W8QqE;WRB<=1hu5JLO~dH<`er^U0rNKS}5`)FCKl_xj-xw
zI4-5vO3A~3Jjh?qH3*on^Yf<tQpdUSQM8Iyor|cISPA|S!5G$}&>nY9p0oCpUO8ks
zn-XRZ8xQLyyVGhmR7O8C$m?H2KGoNfK@MEC<gRQYEP&Bo$xsY*_UQWuF3g><>p?Lp
z(wdj`p=IaRV-=e>r?gtvueZXw$)ME`dwyPq;dmJ|r_%3p`o)cbubqhX*@~YOQEe^P
zD4Z@mEwM)Q%z>!GTzIOmlV;jAnR$;b+`KvF9dnmtTZ=*uvK{^nK!9S*HiyW!cbLqE
zn9hL>KqUvih_4-kWS*?LBGcM41=PB6&7Rne(NsgFH@<r4@ToR<jhfTmgp<3Fiyc`4
zF6Yo^!vF>zHFg5wt!gFPddD#ZOeie;4G?z@U_;|9>T89N6AwRJz<u!MMy=H{8AgB9
z;rIo255<2e6rQBsf(UY-zQf)O=R4p(8U}k>U`VSz%U+!^`IbMJZ`|H+Vx(59?9SsU
zZkpL<7{O3{iO3mCEj_ACr$f}hg_&w1szIg7D8YjX9LE6dk*Fpd995dA-b-E_{S#8E
zZi2g>uvW<@3tr;c$!W>T<G&{#o0mvyDH?c`Wo^K-&`KUovWRe$o)*xz9BAfP8_PJX
zYIS$5AS#csYD=v`dHOKt7<NKSn@l6}8oHnQ(TzQ2E5MTwXf8a=hR=RT9%3(XjiN)W
zt;D){{jCOvb0h)u84KpDIbch$uM^U+&}N}i;9A5kC`hNEB;77OY34G?URx<SZW}}D
z?Zu>C7*5)pnZyF|c2Nt>XVu_|_dg75xxp1605K2Fd4u34S&$<%X?G<gnkdRH^(29g
zSvm^|JJJX2w~_`9)?kD<px&s_f(=g&8B`iN@E^FA8sZ4i<FCV|Bo=$d1lWVWh;-+H
z<LeTL6-Yav@>JUlQhvLcuy=Aqsp%wI72D3xbX#t2$7y3`(~g2d{SJ*%y{oiTXnpRv
zatEMmNbKN$Z5YJz+HYrfy|LjAr{FYNI1Q<HWs!Z>v1GSpCOP7mKu$XfNIP!?)h7y0
z8W_Z(`v@xN06_*o_$Kied_rb`E)g^tWKP+DGbFMGIF5sVgS0VZ%~22G9$dg#5ugdX
z5DW_F4G-W*494YPZu}>w$8MO=);8+G6UQ)$CYv_VWYx>SK-z8x?5)-qGkU7>a@*HT
zoM`yy*T250ZSv$Q0niIPnHr&Q7)_1(B%~HNy}$g>Ce>rFwa&Dd^cQtjqV)g(7*R<?
zK~&mYBhR&Sx|tTMAy4GBFft;M!Bv9Pdi=+IrzW1!#xt@s3~tzg@Xym35>l}MASmXb
zEHX*IpR5}7%YhZKpmiObp4?IMF!{85fz;xF>LuY7ISRl^Gb}#11BJ^k{9jOmh}TVY
zI_n;drtYK3GwYuFc-^;7;8^8JJJ7#Feg>&{c5nXwo^xH$+LE=zW@F3kHhv;Q=fZ*$
zuu7x95a|4pKn%|!j+q`GBETnJw4*o#uaFLdAdRikWAgujYT#ue5_2ZKG;f0?bACyv
zl%o1NYjUdq<#?;$eSq1=Q>q<iAQkEER?g@)X=gNjIN|3s+eKjAV>K8$-zzCO`nT=d
zmu~@v88CJFkYNz$yUYa_yf(S+<XPui?8<A+J=%FrhhF*6O296x8zcn`j!Y8X@gMku
zg)|1Yw2k6YiiO^Oi4NsZ;2+3<MRU;4KzRThilsxJ>m48lvL3<9LOQzXh0J5;GqrZR
zad}&3-f{)oL~=4*M}`k;t=M~T&3`GXBB|n7N-_uz_!B3-dzRTe`cj*fzM;ovoJ_MB
ztO$!|0#_HKB;@`FnZRvphf!kM4|DMT=8Z)xxdUqBM3_+pxGB!f7&xe;a)5OXh=d$4
zbi0|G(0)YsZ>4hOzq5@uep#4bedobrOLixt_JhwLzzoZlugg7BS9odDY3>$NThSaw
zVbqCmxElvFTtm9ainFTQl0zEkyrW&J6E+!SiytQH+)&HrKv5KD+aVL6u7Z2MbwQWt
z<Z|blthu|?s)pk#b=UIl?#a6n*^~ii5a`$RZMPjP-uk)gs-{NWZ8oKP;(uK_hGIeG
ziL*Q`)ZD?%7Dzfb`T9n`L?Ynp3JaM6^;n$byBY@{50eB6d!G1I!c<>h0JA!2FNx#S
zV_ke<CCi-tAIFcl4u)0l$|jzg4+w*-Sn-_pvrQ8(X=*C`nL@3aEjTh1?sWkYrgxnH
zn^tF503v$m=$-Abg&3Ivoeo4Rk?;b;y3DM)2c{9&yu>MmQ79=;TMInw?r_-0V2@Bz
zcVkyUdijP_Xp0Az4B>efY~oVas1<e2@srkHxo_X%wZ65D<=I2RSn`I>1HJ#!C7XsH
z*`K+xrNj6gi!Cb`ZbgP!9Tca2Q+jfW4_&cjeu0sf0>_CAXvqW}th&K18{GplBG{C3
ztcy|zup7skVf(&=7F|w;by}c<9=6-r&u$#^-l+StU%EG6>@v7_(vwwBPiKOyKHvox
z!!%I^`YVdp?x+Mx`1Sq@nCUNu>qB0?=Ly}ePtVDr?1ee7hd9zjca&L8%uH)%=5(`F
zZQyu~isO}VDG<Vjwo5#Nv(RAB7U}>B2e{grXjBc&V<uHDJh1CqhvLCzLR)e9<sT2<
zyKBUKot@g7tahydD<-L12Nh{D(Ic(=ab82^CsbJ4VTOJVY7`Vla4N^yj)s|AfX*-N
zl8BT|B(`Rl&1+~{Jj$v&kFqxP9)Zg^Y$G`h0Hm)+2B`-0Db((YUtNFI+``%u?`ds4
z*|<xVywF!2-0gAEOhbnu>#FIWe7O@!^<xm<I)M5c>KVE%Rp7z&H`lHmbNY1lMYXlM
zTRYl{XSf8k<N@4CnnX{VJiorslk?0d1d^HA_`u4R$&XaTp%#u?#M&vYP~14>)|;B@
zihr~21La6T052I*XYxTtA6=4zjc`z*!%4jmo#c80#DTGiwC^E}d{9^1BY`W!(GE$$
zIKjrkM)KJnGEIAslxU8VVnqWPscd#S6y{5YRXMgSB%5&~*&E<!1%VkJj5g#4WDZQt
z_1FLw@7|Y`pFM_@eKdjj9DMT<!NI76hax}<#~he-3WeH}rHA1W|Neq;S6sE_k}tl{
zJ=xVcY9h}$K?McY2?H2-mkQ{soJJn105xX?$ceFqm>J}XD;_iK-En2b`D*R$PEMl(
z12z~fe7j6+6-sC>m<3qq?1V;}Cm7IxNFs;<Dq<!&riYAH)RVK+CrOF=IGLh3Oh$pR
zU^Z(ZY8tg=JOQghP=n$h&=+DHl*obK6VonoJjEIsJ=SnObfQYcPWz4=(E|#RW6j&=
ze+ZvGEGygfg9BAXPde;0EHVcUZ4}i5bn9uo;6d0YsR&U?8PQQQ$kR`+RQ=!o-Ta#k
z9~Q5)yHp@XA%0=_^jnC^C^@bqh-mnO5g*+zi#YPb8k0c_S(+zm)+y$w>Zp-o4Vk1q
zL}qJuld1YsFbi}O6~hs*P6abnY&r<q(x8g73AO?~4I*rqP2f8$9;90K3SHpfKy}Kl
z(pZ*-5l5s9QT{U+r@~QeM2xvIlUsUa<*dJt9PwpAWAns&T`o9XmTV@GBnF14)HY75
zGHqNKr(IW6406%DUF8qnXMC;8nmrE0QtX+~6%a&JV4~<g*jX{ac!vvo-0`Jg#*}6%
zTPve9?}A?Z8R1&K<VfvaUR>5m1WN3=d*-lHU%A%OJ+|o}xG+i_E}^b?$A_dAM7HW>
z3<*5^1D~K3p7Ma{{k}tIg0hvA=7dNWnc<Tsp(lIXzfy5=Lx~Om3wHY+!<*=GMwdEM
zZ>VW$<y|g<43gv^Z5GqSsHp$AzJC5%q-#7uR?o)8<fL)cmv7y}ykxcI<PO}1H7tr5
z)a#f#6w0o>nhe*gMs@uMH8o3`3DJmL2!a1-+xY1Q+umZ}1_u2GN~VaR*O(FUhd72y
z%t<G49IJ2bO86Zg*hv%4agkbu1;Qwy)q=(?iQ(agUoUv_3C#+-LjxjKQmsN@Ov5!K
zLvnJe4_&bE_;tV>aqor5Vvw?_TgNswh|gLb24D`vY@BS_k01b#vOz5BkCa5g@-~{X
zzok)`o|~T2vSV}2LOTbaZSdF8FK<8uOl^uQ7B7M&n#P4HzktuNyy7CiM-W|Ec40@R
zxehBj<O7P0oJfl*T9wdV3yKezuUAuK^>T8-Gh1(Y;*a@%?lxx{2?gsqNqLhT)KSv$
zH<o1Q*6m$-op{lzzbsFPUu0Pfa;hnFagR%%A&sQcSeJ-y7l0_}%%GWXQ?gw@v^ja$
z;2Gzz15P)a1JXr!-Me9fmUH&Z1HC-lMw^%*btZ~f+i1aL)aeqws7>xFAUF<C^ni5;
zDBqNEkFx$HP}KS7@499G{?m_`tjc_mSA((}2GyiZkw6Yms!(u%t$0Mks+!uHZ>K2#
zJ0Sh*7u_35=Mh6;u5b{fb~`1Yb|*;z7TE&D9T%L6J#eu`%mr!JzjKzdtE&h$=w!7`
zPHXU%DYZb=XA460>Z;`2=a(pEmeU@08mUAPuf2LO0p0hWd%nmYH+J_bgRb57#TTPr
zH1{a;37D><4hQ$b5-)WCM4UBnQ&8RAJ!9t1OKWN;eJ_#Bfq0VDi4Gi|`swJ=)jw0K
zsSb3}ocMsl3n(3V;~W>OtyZY&HnD8mB0{QQMIK$~X+E`3#ZuWI7A3CF0f8M1Ew&nm
zCuJNQoHYn;euDpMl{2Op1RYMSTGg33X~MSOWo8|1ed15!nyZhGy|u?ig98Xqjl<00
zW{l|QCo455YzS>8TBVtk6d!o-m%mt%yKC3N4}szdr;n`O4h6$aUFW}c!wo0aZ{BQs
zqP;!y8W+ca2m>byq@7Z<r;4*~;J^Tf8v*PY1WtDWxcT^)qDF&usi%!%I@c={mQNU$
zewW47R7FU6aODfQ6E*y9?ik{70g>XYj}N8LNdsIrbttd?NP9(sRlGjM4CteDYcC}V
zHXCd?M-f(BzczRCj{KYN$Wi~IvrADRkW#=1SQY?|fZw1SB%m(@tq;(XLb59*ReWw<
z)4Iirt8RYfm0Q{?DuQN6NTe(V!IF?k2pQ81{qAOXz2%|{KAL{;NY0(+p4=;Y>>1fG
zpg;;}fCoXy<-L6r85?#S5DJ0{5ioJzRP5H2;r<4f3-aZS4$g2R!lBsVkgf)3p*loS
z>Wvg*-vx9AvksM5dRxtiEt+Yw%b2eed5jg5G>Ksn7l3i{LWe`e#x&Z7Xz-v$_hMRP
z^x+u<=uKaA(ZRE8YFs~QYBpZ|!oRZ>BH$MHog^<0l4oLQiWk-1hXl0``VojyprnU2
zDoYA-j(o86nz~#6{`ad}UU?-!MT7w(n?XD<dZ#hK!bNyM<u?2SBr1OT(@na~A2SP@
zTe2>*SgGk8&y<RSF4M)UDISq2UA=+G^B~ak+Y1>0dl|?(`ePjKe#0IJ4I6yGV=N+z
zR(De>hp1NDC+aiWxy($9&1M|;$!ljlKo?XUDxkY9Xi1TffN(hAQrJfPvZoW>-y}ZZ
zB0W*{m0LULc33FSIGwz2*?@ZH#v9)oRarUghNd>vovfm;fR`>@#0*F?$jJ|o<uz&{
z85@BfM6$D+o?mp+y?4L*#0JaX|BiJTm=HCC1gjSGZJ0V1cEPuIdjGu1a0FVi<Y`51
zZMn|n0$-P;b{I_?3&FBAyQ@7@Z?_v*a5p2;DhC|acR96sM>nH7+O9ViG?*;IIu-3F
zZR&zt`_iTFIUjtm0&V#u+F}6~SYfuegUcCwsSs(+{;m<C$)c3BCKAKphj@aUiJ=4W
z;Ju?KPtAJEjt6Qg<V7bWBCBR5oM)ylcKv%q&91S_J393%)Vj=Z4y(SGXRx`x>@yHG
zhw>yhNFq_I%ss<LHQjgY&_{oTqqV}TPYgu){$(VDLHt4bzqvc~UAU#^+19J~Ptp4Z
zU%N~}zYtOfo@2pvY(+(g?;a2h4Wq#4E)K|v4X{S1okC6Ju@ed1Ge~SD{h=XiOY1No
z06yct3K)r9U_x`sQApnDTujz=FPL<E$K+#H&%7wvoMD$h#&G9?hXD#u9-0oZN|LKL
z9~eKXe&v?k=YNL%Cm~~9jIBsIgTz>`sI#s6YKcM%UJYUPkQDp4R7^y`@e?LNr;Fyy
ziMGK?MEyK4u%3P6J+25P|A?duv`M=xW5}A$3(0oNB2w$hh3OE+5O4w~^*rPQzgfaF
zNhWjVz(R3NiUG@05tXW&%ga0Y<XLk&pIrCmlJ>!745@1H&l$rYJ+-xPBaW?$Vkp$9
z_>tVx*jRr7noGxm6=aeE>Sm;V8Vh{rNltKfM}vlk1NG`DXFhqa9gOj93&<hsL}G)r
zA18u232Hq+rk6_ctnp$lG?t3`<bk>}fKCO&l8o%`PsWVyxOc>ela;GiFX!u4Lp77h
zn?BW$^LWNE2#oHenWa>ya72q7|4~s6DuSnBfm)m(Y-L4DH_$C9T}sX(9Se4WhR_MB
zbp|>*dYV4r%p&VM7m;n2v&k;&+33IkES2F>2GC|m6$O@d-_eP@jkWj84#C@+)L7JN
z!cvum9%nR|4~`nu@nGpU-(R!3qQcqKhzGJ}Ck40hw&{#v5Hiw1krtwbK{TNQ5L*3$
z;%q-{<~)*myf_b%ALkHc6D$H(3+R*w6`N>+&%qa#9CMVAcRS~kPfcf&D*ISs5wf76
z=uR8NDd<`(B&I|M9DRifbA6030H?5^mVLp!;=#V&E9Bz3f>w}>jOINfin<@W_2Spx
zz5CC9wzao|e`IR5R8ioLlw=NU)fvMe$2y40NW{@FNP_3|K7z&fgye=ZBBIdAshGZA
z7a!0dxxrroII_lI1|37St$=K|&m|vpoI?&;roh=oopiE*1Lp~nM_ph7+*$H$hT{By
zCmIJoK)rhVx{?L0q~5e|#ORu*e*LR0tCugY=;;7U)4QwOwFIU}B0dv`i8F>l)B>3a
z4k2=(?|4>!abpSjOcK{cp~Gf^8w?U005)YX?45G+5%t|%qbalAl1FTKkPFugQZu9)
zz_aHUWjq{gQ)R%#dO+P^&PK}~y{5~h)pl(dKe6Svg@x_XnxYdf#9qD}k`2*t#xMxa
ziSt3?(0kUOgG~<@-LdCj-;sK=(fDDu!#ccN6ph#OqINMD<rlIz*TL6g)nHyj6+v<k
zh@b&@7ES7S-o~T~Lm=B?{m{Yz98D`ZqSLfgXJ^}=A2oIV%bVBU&}O#4TCjDnv7fl|
z&j<z)Nd<k9e(fxf#Z@SiCo14##wiF6xc$jgqC4g%5+DNvmz{TNL6biUj4kI;q<J}`
zuum66L!Q|RhA()QMuHMJ$w9nSZJa6a4@2VG;f5E>zc9toc+L{Ge?atO7zG@#s%^>3
z5#Am?w)Sr;e|Ky3@^kBK-Ei{a<jGjzr+%I@f<X?>T0I7)jxk{1-gjy?X570wCjN_O
ze~{svYMMD_E`^?Z%nKEmM+vu#<b!{yc|4=M4u<}6k#Y?e1wG|NCXl?SKo$Xv2e8w7
z)U4S5y)%Os+~7apXn;Ygr+a~|P&kNE)!dSw=XkATRQD?v{O|{dDwbC{&2UENL=7QZ
zK9+Kv(f{;fWoWnY;Iy$*wT$=%-25>K$2@my<TVW$LDKX{q75!!aH)Y>B!=|Bg*r!V
z!^nTQ%MZTaG0$W%=NiF1e+i+CS`lo+M9DZ)Vx?XLB4=Q^p1<Dcl>EUuf}0B30`1U&
z_ZQe{XM1>!uJwR1hxvP6fosEM7rtLpQBmPHbEafdl2|Euy(ozlNCfEWveL2Ocj(_r
zhRgyRBaeQu7qq9dqU`LJp(R@_=)|~V;sDX%lzlk)!ZMBQFij%|9OKC;u7p_O7An|t
zguc#$>J&i2pR}xytd)lr+OW3B#<-BiMLzyA(00ACr9qR`^=7V8c<1|f{BGM_cYWY7
z2TBB4&IlMoi_#%b-V6)^7aIRtL({WB%$FDh8|G23TVbcUi&v3@V1u;FR8Dr;=a6b^
zDQR-#fjKKUhJejAyv2p5b<%kh_Y4rCuvCvmQ3?N~i46w<ILpFxI`vx137uZGwrIHR
zla;@(+j8^b#ju=Che#MWBN)VX_Jq;h0{;dt&}DV5T&CJSnrt^uAlrJ%$#HuzF>`su
zDS4a$=}S6^3%w^`9e|@Mb}Trm8wqEr^_{{&AM6KU0S$5?h)L~4qZD>2b)8>i=9*us
zuKIKzAzyDXDIS6iNd|fBu@?>h`bXwCo0vPhtz+~;hn38Axpc!_A~?;(p%aYp(1$Js
zzCd~Dl1c3RfF_i&aAX}a0owu>2EpElL?~3Rf*u0TVyo3X@FX13Xj^w@=9%Bi&S?H%
z>(=F+$m7^NQLKQS>NI1-OKJ)4@dAlAzkAOB`ZNW-x;KbonPT2I{y0+TDxTidPF-j=
zD;8NSs*x^UrQy+i44h%YH3R{dr`Yk`69P6TC7R@EMwnl$C-!9z$9i-NFbzmiu+IQK
z!4#VIF0I0GvUmh@(4en-b#!6g&VRo3nTeuqNBfj?NHPWntv5l3#<H1N^Y6{-JY7Ck
z;Kp9uV`Uaw9P06+sLkeFD!9TPlHh4XsmH)G<_Hjtl8m1y!Alhkk_Y24co+f~|9CwD
zTp+DLXBGAqwbs?3(sX{AX|%s*Fz62a@|VumWy{XR`^1Ns%;#?DnewlPa!G3s^k-(t
zlGk)iO(RE`&6<VXCgw7SMLP-34i>xkY=(!+8by$!rO89m5aGax)q+1*V2XYRLX%d_
zH~~Y)$0{T9qAikyRdk#UX5Ez41%`wsoz_|hv%yxifox|4&F*0ny6dlhaAEiD<#-x1
z9a0qo5-H=Y9P|tNuDhOARG%7GQdcv2aYqNWu*a;L>f)3oPCJ}a<<UR^r6&|4aP)*u
zBw1ph!l_rZ2vv!M&KOXx6z~_Dj%DLihR;wxknr$gOEmeAzN1|fNcu#&P8wopC1||x
z79$6wvpZRqap-hngFuTrva_0ws73W&o#ABdgsF!cum8=@yD$A0+%Qm)o&f-fLpDUg
zAQkk=m1iqH{`f>`S8M4)7hf{p=~PeSMCDkUT?;qR;tgKCnnOt}!p<kzBEe4rwL`E#
zl}2h$U-zOOo8sFXU&iaL2M*S~onHx8A^=l>^#{yhO1Mi#(bYiHu39+9QzI~r(^`X}
z5ib0wS7=<Vxdrvj=b!y)`=9^(R1Y*|$Q--%q9*+iGX{KnR7fC87d)5S+E$*|;mp%B
zVvok=>eA98t#djvHFg)LRx^~ARnS_FvuVKUPD`;$9V5^hyGW~@B6!+$(k#m>z?nG3
z3JeHSkeP;AMSuv9#icsHLLF{#Mgu2s;J|@1GjOxWDBun~wF&(6GEUgEgWfGz1&3&X
z;{`TQYg!z3rIiw`4vmqraU5p{?-y2;vam-~S*;@rKC&teHRj2a>ulFv`+85gk0=9^
zl6%iAWQ)@u(ili%AdP`E2GSTvV<3%zGzQWbNMj&L82Eq5G!#_6meg_p0000<MNUMn
GLSTYdBrlKv

literal 0
HcmV?d00001