update

pages.json

@@ -324,6 +324,28 @@
                     {
                         "navigationBarTitleText": "商品审批"
                     }
+                },
+                {
+                    "path": "newDetail",
+                    "style":
+                    {
+                        "navigationBarTitleText": "商品审批"
+                    }
+                },
+                {
+                    "path": "newApproval",
+                    "style":
+                    {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "商品审批"
+                    }
+                },
+                {
+                    "path": "transferPage",
+                    "style":
+                    {
+                        "navigationBarTitleText": ""
+                    }
                 }
             ]
         },

pages/businessApproval/businessApproval.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-	<!-- 	<view style="flex: 1;overflow: hidden;" >
+	  <!-- 	<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>

pages/businessApproval/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>

pages/businessApproval/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.getList()
+      }
+    },
+    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",
+                  BusinessProcessState: "2000,3000,9000,9999",
+              },
+              ShowWholePower: true,
+              PageIndex:1,
+              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.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()
+      console.log('onShow')
+      _this.getData()
+      this.shouldReLoadingList(false)
+    }else{
+      console.log('onShow')
+      _this.getData()
+    }
+  },
+  onLoad() {
+    this.pageData.isLoading= true
+    uni.showLoading({
+      title:'正在加载'
+    })
+    // this.getList()
+      this.getData()
+  },
+  onUnload() {
+    this.$util.addUserBehavior()
+  },
+  onHide() {
+
+  }
+}
+</script>
+
+<style scoped>
+.content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  /* height: 100%; */
+}
+
+</style>

pages/businessApproval/productDetail.vue

@@ -486,6 +486,7 @@
 	}
 
 	.page-title {
+
 		padding: 15upx 0 15upx 30upx;
 		font-size: 26upx;
 		color: #949494;

pages/businessApproval/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>

pages/dataSummary/detail.vue

@@ -181,7 +181,6 @@
 					<div class="check-btn no-check" @click="maskFn">取消</div>
 					<div class="check-btn" @click="examine()">确定</div>
 				</div>
-
 			</div>
 			<div class="opinion2" v-show="showPopupCheck">
 				<div v-if="ischeckOut">
@@ -299,15 +298,15 @@
 			<div class="check-btn-box page-btn-box" v-if="isCheck!==0">
 				<!-- 财务审核 -->
 				<template v-if="isCheck==2">
-					<div class="check-btn" @click="openCancel()" v-if="effectiveDetail.TREATMENT_MARKSTATE!==3">
-						<span>作废</span>
-					</div>
 					<div class="check-btn" @click="menuImg(true)">
 						<span>驳回</span>
 					</div>
 					<div class="check-btn" @click="menuImg(false)">
 						<span>审核</span>
 					</div>
+          <div class="check-btn" @click="openCancel()" v-if="effectiveDetail.TREATMENT_MARKSTATE!==3">
+            <span>作废</span>
+          </div>
 				</template>
 				<!-- 数据校验 -->
 				<template v-else-if="isCheck==1">

pages/everdayRenven/AnhuiIndex.vue

@@ -21,14 +21,14 @@
 							<div class="operation-tab-unit" @tap="selectTab('nowTab',2)" :class="{'active':nowTab==2}">
 								经营业态</div>
 							<div class="operation-tab-unit" @tap="selectTab('nowTab',3)"
-								v-if="areaProgress.length && areaProgress.length>1" :class="{'active':nowTab==3}">区域营收
+								v-if="areaProgress && areaProgress.length>0" :class="{'active':nowTab==3}">区域营收
 							</div>
 							<div class="operation-tab-unit" @tap="selectTab('nowTab',4)"
 								v-if="theRequest.ProvinceCode == 340000 && theRequest.GroupType == 1000" :class="{'active':nowTab==4}">车流分析
 							</div>
 						</div>
 						<div class="operation-content-box">
-							<div v-show="nowTab==1" v-if="modelProgress.length>0&& theRequest.ProvinceCode==340000">
+							<div v-show="nowTab==1" v-if="modelProgress && modelProgress.length>0 && theRequest.ProvinceCode==340000">
 								<canvas canvas-id="modelCont" id="modelCont" class="operation-content"
 									@touchstart="touchPie($event,'modelCont')"></canvas>
 								<div>
@@ -44,7 +44,7 @@
 
 								</div>
 							</div>
-							<div v-show="nowTab==2" v-if="regionProgress.length>0">
+							<div v-show="nowTab==2" v-if="regionProgress && regionProgress.length>0">
 								<canvas canvas-id="businessCont" id="businessCont" class="operation-content"
 									@touchstart="touchPie($event,'businessCont')"></canvas>
 								<div>
@@ -60,7 +60,7 @@
 
 								</div>
 							</div>
-							<div v-show="nowTab==3" v-if="areaProgress.length>0">
+							<div v-show="nowTab==3" v-if="areaProgress && areaProgress.length>0">
 								<canvas canvas-id="areaCont" id="areaCont" class="operation-content"
 									@touchstart="touchPie($event,'areaCont')"></canvas>
 								<div>
@@ -75,7 +75,7 @@
 									</div>
 								</div>
 							</div>
-							<div v-show="nowTab==4" v-if="bayonetProgress.length>0">
+							<div v-show="nowTab==4" v-if="bayonetProgress && bayonetProgress.length>0 ">
 								<div>
 									<div class="operation-c-list" v-for="(item,o) in bayonetProgress" :key="o">
 										<div class="operation-cl-unit">
@@ -376,7 +376,6 @@
 							labelWidth: 16,
 							border: true,
 							borderWidth: 1,
-
 							borderColor: '#fff'
 						}
 					},
@@ -499,6 +498,8 @@
 				const [tprogressList, tpieList] = this.getProgressData(busniessTradePie, totalData.cashPay)
 
 				this.regionProgress = tprogressList
+        console.log('this.regionProgress',this.regionProgress)
+        console.log('tpieList',tpieList)
 				// 经营类型分析
 				var colors2 = ['#5E67B4', '#4E5699', '#75B7AD', '#AFB7E6'];
 				this.showPie({
@@ -510,6 +511,7 @@
 				// 饼图分析及数据条形分析
 				const [aprogressList, apieList] = this.getProgressData(busniessAreaPie, totalData.cashPay)
 				this.areaProgress = aprogressList
+        console.log('this.areaProgress',this.areaProgress)
 				// 区域营收分析
 				var colors3 = ['#FFAC37', '#d8ece9', '#f7f5f6', '#b2b7e3', '#F4B27A', '#F3B1C9', '#e0e3f7', '#FFE886', '#f7f5f6'];
 				this.showPie({
@@ -523,6 +525,7 @@
 					// 显示片区车流量数据分析
 					const [bayonetList] = this.getBayonetData(bayonetPie)
 					this.bayonetProgress = bayonetList
+          console.log('this.bayonetProgress',this.bayonetProgress)
 				}
 
 				if (reginList.length) {
@@ -648,7 +651,7 @@
 			this.opacity = (options.scrollTop - 30) / 68
 		},
 		onLoad(option) {
-
+      console.log('optio1n',option)
 			uni.showLoading({
 				title: '正在加载...'
 			})
@@ -676,6 +679,7 @@
 				}
 			}
 			this.nowTab = this.theRequest.ProvinceCode == 340000 ? 1 : 2
+      console.log('this.nowTab',this.nowTab)
 			this.todayAmount()
 			if (this.theRequest.GroupType == 1010) {
 				this.getDetail(this.theRequest)

pages/everdayRenven/components/ServiceRevenuePie.vue

@@ -106,10 +106,10 @@
 			background-color: #fff;
 		} */
 	.uni-ec-canvas{
-	    width: 750rpx;
+    width: 690rpx;
-	    height: 526rpx;
+    height: 526rpx;
-		margin-top: 40rpx;
+    margin-top: 40rpx;
-	    display:block;
+    display:block;
 	}
 
 </style>

pages/everdayRenven/index.vue

@@ -711,7 +711,9 @@
 						['OTHER_REVENUE', '其他营收']
 					];
 					var businessData = _this.operationBusniess(SHOWBUSINESSTRADE, data);
+          console.log('businessData',businessData)
 					this.regionProgress = businessData[1]
+          console.log('this.regionProgress',this.regionProgress)
 					_this.showPie({
 						id: 'businessCont',
 						data: businessData[0],
@@ -1186,12 +1188,14 @@
 			this.opacity = (options.scrollTop - 30) / 68
 		},
 		onLoad(option) {
+      console.log('indexOption',option)
 			uni.showLoading({
 				title: '正在加载...'
 			})
-			const toSnhuiPageProvinceCode = [340000,520000,451200,510000,620000,630000,330200] // 需要跳转到安徽类型的每日营收推送页面
+			const toSnhuiPageProvinceCode = [340000,520000,451200,510000,620000,630000,330200,330300] // 需要跳转到安徽类型的每日营收推送页面
 
 			if (option.ProvinceCode) { // 从推送进入
+        console.log('12321312',toSnhuiPageProvinceCode.indexOf(parseInt(option.ProvinceCode)))
 				if (toSnhuiPageProvinceCode.indexOf(parseInt(option.ProvinceCode))>-1) {
 					// 451200、510000、520000、620000、630000、330200
 					uni.redirectTo({

pages/index/index.vue

@@ -226,7 +226,7 @@
 				}
 			},
 			toPage(item) {
-
+        console.log('item',item)
 				let _this = this
 
 				if (!this.user.Membership_Phone) {

pages/register/register.vue

@@ -4,10 +4,9 @@
 			<image src="https://eshangtech.com/ShopICO/yxcl-register-pht.png" mode="aspectFit"></image>
 			<view class="desc" v-if="!user.WeChat_UserId ">
 			 <!-- <view class="desc">申请获取你的公开信息(昵称、头像)</view> -->
-				<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>
+				<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">手机授权</button>
 			</view>
 			<view class="desc" v-else>
-
 				<button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>
 			</view>