no message

.env.js

@@ -2,28 +2,33 @@ let version = __wxConfig.envVersion;
 
 // #ifdef MP-WEIXIN
 if (__wxConfig.envVersion === 'release') {
+
     //生产环境
     ENV_CONFIG = require('.env.trial.js');
+    ENV_CONFIG.isCanvas2d = true
 }  else {
+
     //开发环境
     ENV_CONFIG = require('.env.trial.js');
+    ENV_CONFIG.isCanvas2d = false
 }
 //#endif
 // #ifndef MP-WEIXIN
 if (version === 'develop') {
-    ENV_CONFIG.isCanvas2d = false
     //开发环境
     // ENV_CONFIG = require('.env.dev.js');
     ENV_CONFIG = require('.env.trial.js');
+    ENV_CONFIG.isCanvas2d = false
     // ENV_CONFIG = require('.env.prod.js');
 }else if(version === 'trial'){
-    ENV_CONFIG.isCanvas2d = true
     //体验环境
     ENV_CONFIG = require('.env.trial.js');
-} else{
     ENV_CONFIG.isCanvas2d = true
+} else{
+
     //生产环境
     ENV_CONFIG = require('.env.prod.js');
+    ENV_CONFIG.isCanvas2d = true
 }
 //#endif
 

api/task.js

@@ -59,3 +59,4 @@ export const getAdjust = (data) => request(newsUrl + 'adjust', 'post', { ...data
 export const getDateBacklogStatistics = (data) => request(newsUrl + 'back-statistics', 'post', { ...data },true)
 export const getPdfList = (data) => request(newsUrl + 'pdf', 'post', { ...data },true)
 export const auditPdf = (data) => request(newsUrl + 'audit-pdf', 'post', { ...data },true)
+export const getDateCashier = (data) => request(newsUrl + 'date-cashier', 'post', { ...data },true)

common/chart/circle_chart.vue

@@ -84,6 +84,7 @@
 		},
 		onReady() {
 			// this.getServerData();
+      console.log(process.uniEnv.isCanvas2d)
 		},
 		methods: {
 			getServerData() {

page_subpack/message/message.vue

@@ -71,6 +71,7 @@
 				list: [],
 				page: 1,
 				isEnd: false,
+        isAJAX:false
 			}
 		},
 		watch: {
@@ -130,16 +131,19 @@
 				this.list = [];
 				this.page = 1;
 				this.isEnd = false;
+				this.isAJAX = false;
 				this.getNotices();
 			},
 			getNotices() {
-				if (this.isEnd) {
+				if (this.isEnd || this.isAJAX) {
 					return;
 				}
+        this.isAJAX=true
 				getNotices({
 					'page': this.page,
 					'type': this.current
 				}).then((res) => {
+          this.isAJAX=false
 					if (res.code === 1) {
 						if (res.data.items.length <= 0) {
 							this.isEnd = true;

page_task/task_details/module/send_chat.vue

@@ -5,13 +5,13 @@
 				v-model="msgData.msg" :maxlength="999" :placeholder="placeholder"></textarea>
 			<view class="size-26 m-t20 sys-weight-600">上传图片</view>
 			<view class="image-content">
-				<view class="image-box m-t20 r-10 m-r20" :key="index" @click="showImg(msgData.msg_img,pIndex)"
+				<view class="image-box m-t20 r-10 m-r20" :key="pIndex" @click.stop="showImg(msgData.msg_img,pIndex)"
 					v-for="(msgImg,pIndex) in msgData.msg_img">
 					<image class="image-item wh-110" :src="msgImg.type===1?msgImg.url:getVideoImg(msgImg.url)"
 						mode="aspectFill">
 					</image>
 					<image class="wh-45 video-icon" src="/static/img/task/play.png" mode="aspectFill"
-						@click.stop="showVideoImg(item.url)" v-if="msgImg.type === 2">
+						@click.stop="showVideoImg(msgImg.url)" v-if="msgImg.type === 2">
 					</image>
 					<image class="delete-iocn wh-25" src="/page_task/static/img/information/hint-subtract.png" mode=""
 						@click.stop="shutImg(pIndex)"></image>
@@ -57,6 +57,11 @@
 				<view class="popup-row" @click="showUploadingImg(false)">取消</view>
 			</view>
 		</uni-popup>
+    <uni-popup ref="videoPopup" @change="closeVideoImg">
+      <view class="video-box" v-if="videoUrl">
+        <video class="myVideo" :src="videoUrl" :autoplay="true"></video>
+      </view>
+    </uni-popup>
 	</view>
 </template>
 
@@ -84,6 +89,7 @@
 					msg_img: [],
 					file_list: [],
 				},
+        videoUrl:''
 			}
 		},
 		watch: {
@@ -95,9 +101,29 @@
 			}
 		},
 		methods: {
-			showImg(item, index) {
-
-			},
+      closeVideoImg(e) {
+        if (!e.show) {
+          console.log('关闭视频了')
+          this.videoUrl = ''
+        }
+      },
+      showVideoImg(url){
+        this.videoUrl = url
+        this.$refs.videoPopup.open('center')
+      },
+      showImg(item, index) {
+        let imgList=[]
+        for (const imgListKey in this.msgData.msg_img) {
+          if(this.msgData.msg_img[imgListKey].type===1){
+            imgList.push(this.msgData.msg_img[imgListKey].url)
+          }
+        }
+        uni.previewImage({
+          urls: imgList,
+          current: item.url,
+          success: () => {}
+        })
+      },
 			clickBut() {
 				console.log('------butClick--------------')
 				this.$emit('butClick')

pages/index/module/index_column.vue

@@ -101,6 +101,7 @@
 		getSysCashier
 	} from "@/api/statistics";
 	import EnNumber from "@/components/en-utils/en-number/en-number.vue";
+  import {getDateCashier} from "@/api/task";
 
 	export default {
 		name: 'index_column',
@@ -163,7 +164,7 @@
 					return ''
 				}
 				this.dateTypeObj.selectDate = this.modelTime
-				getSysCashier(this.dateTypeObj).then((res) => {
+        getDateCashier(this.dateTypeObj).then((res) => {
 					if (res.code === 1) {
 						this.moneyData = res.data
             console.log(	this.moneyData )

pages/statistics/module/head_filter.vue

@@ -186,12 +186,13 @@
 					this.is_flag = !this.is_flag
 				}
 			},
-			onSelectTime(e) {
-				console.log(e);
-				const year = e.slice(0, 4)
-				const month = e.slice(-5).replace(/-/g, '.')
-				const day = e.slice(-5).replace(/-/g, '.')
-				console.log(year, start, end);
+			onSelectTime(date) {
+        this.setTimeData(date,0)
+				// console.log(e);
+				// const year = e.slice(0, 4)
+				// const month = e.slice(-5).replace(/-/g, '.')
+				// const day = e.slice(-5).replace(/-/g, '.')
+				// console.log(year, month, day);
 			},
 			moveHandle() {
 				return false