ccjgmwz 3 năm trước cách đây
mục cha
commit
02771e756e
7 tập tin đã thay đổi với 185 bổ sung184 xóa
  1. 2 2
      config/index.js
  2. 34 34
      pages/sale/information.vue
  3. 34 34
      pages/sale/newsinfo.vue
  4. 34 34
      pages/sale/plant.vue
  5. 34 34
      pages/sale/portprice.vue
  6. 13 12
      pages/user/report.vue
  7. 34 34
      websocket_sdk.js

+ 2 - 2
config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	// baseUrlNew: 'http://192.168.1.119:9100/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.119:9100/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 34 - 34
pages/sale/information.vue

@@ -240,40 +240,40 @@
 			});
 
 			var infoList = [];
-			uni.request({
-				url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				// url: "https://hq.sinajs.cn/list=C2109",
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: function(result) {
-					// resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-					var tmp = result.data.split('"')
-					for (var i = 1; i < tmp.length; i = i + 2) {
-						var list = tmp[i].split(",")
-						var data = {
-							goodsName: list[0],
-							newPrice: list[6],
-							openPrice: list[2]
-						}
-						if (data.goodsName) {
-							infoList.push(data)
-						}
-					}
-					let name = 'infoList';
-					let value = infoList;
-					that.$store.commit('$uStore', {
-						name,
-						value
-					});
-					// console.log("infoList",infoList)
-				},
-				fail: function(e) {
-					console.log('error in...')
-					// reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-					reject(e)
-				},
-			})
+			// uni.request({
+			// 	url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+			// 	// url: "https://hq.sinajs.cn/list=C2109",
+			// 	header: {
+			// 		'content-type': 'application/x-www-form-urlencoded'
+			// 	},
+			// 	success: function(result) {
+			// 		// resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+			// 		var tmp = result.data.split('"')
+			// 		for (var i = 1; i < tmp.length; i = i + 2) {
+			// 			var list = tmp[i].split(",")
+			// 			var data = {
+			// 				goodsName: list[0],
+			// 				newPrice: list[6],
+			// 				openPrice: list[2]
+			// 			}
+			// 			if (data.goodsName) {
+			// 				infoList.push(data)
+			// 			}
+			// 		}
+			// 		let name = 'infoList';
+			// 		let value = infoList;
+			// 		that.$store.commit('$uStore', {
+			// 			name,
+			// 			value
+			// 		});
+			// 		// console.log("infoList",infoList)
+			// 	},
+			// 	fail: function(e) {
+			// 		console.log('error in...')
+			// 		// reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+			// 		reject(e)
+			// 	},
+			// })
 			uni.showTabBar()
 			this.pages = 1
 			this.isLoadMore = false

+ 34 - 34
pages/sale/newsinfo.vue

@@ -71,40 +71,40 @@
 			onLoad(options) {
 				var that = this
 				var infoList = [];
-				uni.request({
-				    url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				    // url: "https://hq.sinajs.cn/list=C2109",
-				    header: {
-				        'content-type': 'application/x-www-form-urlencoded'
-				    },
-				    success: function(result) {
-				        // resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-						var tmp = result.data.split('"')
-						for(var i = 1; i<tmp.length;i=i+2){
-							var list = tmp[i].split(",")
-							var data = {
-								goodsName:list[0],
-								newPrice:list[6],
-								openPrice:list[2]
-							}
-							if(data.goodsName){
-								infoList.push(data)
-							}
-						}
-						let name = 'infoList';
-						let value = infoList;
-						that.$store.commit('$uStore', {
-							name,
-							value
-						});
-						// console.log("infoList",infoList)
-				    },
-				    fail: function(e) {
-				        console.log('error in...')
-				        // reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-				        reject(e)
-				    },
-				})
+				// uni.request({
+				//     url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+				//     // url: "https://hq.sinajs.cn/list=C2109",
+				//     header: {
+				//         'content-type': 'application/x-www-form-urlencoded'
+				//     },
+				//     success: function(result) {
+				//         // resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+				// 		var tmp = result.data.split('"')
+				// 		for(var i = 1; i<tmp.length;i=i+2){
+				// 			var list = tmp[i].split(",")
+				// 			var data = {
+				// 				goodsName:list[0],
+				// 				newPrice:list[6],
+				// 				openPrice:list[2]
+				// 			}
+				// 			if(data.goodsName){
+				// 				infoList.push(data)
+				// 			}
+				// 		}
+				// 		let name = 'infoList';
+				// 		let value = infoList;
+				// 		that.$store.commit('$uStore', {
+				// 			name,
+				// 			value
+				// 		});
+				// 		// console.log("infoList",infoList)
+				//     },
+				//     fail: function(e) {
+				//         console.log('error in...')
+				//         // reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+				//         reject(e)
+				//     },
+				// })
 			},
 			onPageScroll(e) {
 				this.scrollTop = e.scrollTop;

+ 34 - 34
pages/sale/plant.vue

@@ -113,40 +113,40 @@
 		onLoad(options) {
 			var that = this
 			var infoList = [];
-			uni.request({
-				url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				// url: "https://hq.sinajs.cn/list=C2109",
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: function(result) {
-					// resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-					var tmp = result.data.split('"')
-					for (var i = 1; i < tmp.length; i = i + 2) {
-						var list = tmp[i].split(",")
-						var data = {
-							goodsName: list[0],
-							newPrice: list[6],
-							openPrice: list[2]
-						}
-						if (data.goodsName) {
-							infoList.push(data)
-						}
-					}
-					let name = 'infoList';
-					let value = infoList;
-					that.$store.commit('$uStore', {
-						name,
-						value
-					});
-					// console.log("infoList",infoList)
-				},
-				fail: function(e) {
-					console.log('error in...')
-					// reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-					reject(e)
-				},
-			})
+			// uni.request({
+			// 	url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+			// 	// url: "https://hq.sinajs.cn/list=C2109",
+			// 	header: {
+			// 		'content-type': 'application/x-www-form-urlencoded'
+			// 	},
+			// 	success: function(result) {
+			// 		// resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+			// 		var tmp = result.data.split('"')
+			// 		for (var i = 1; i < tmp.length; i = i + 2) {
+			// 			var list = tmp[i].split(",")
+			// 			var data = {
+			// 				goodsName: list[0],
+			// 				newPrice: list[6],
+			// 				openPrice: list[2]
+			// 			}
+			// 			if (data.goodsName) {
+			// 				infoList.push(data)
+			// 			}
+			// 		}
+			// 		let name = 'infoList';
+			// 		let value = infoList;
+			// 		that.$store.commit('$uStore', {
+			// 			name,
+			// 			value
+			// 		});
+			// 		// console.log("infoList",infoList)
+			// 	},
+			// 	fail: function(e) {
+			// 		console.log('error in...')
+			// 		// reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+			// 		reject(e)
+			// 	},
+			// })
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;

+ 34 - 34
pages/sale/portprice.vue

@@ -102,40 +102,40 @@
 		onLoad(options) {
 			var that = this
 			var infoList = [];
-			uni.request({
-				url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				// url: "https://hq.sinajs.cn/list=C2109",
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: function(result) {
-					// resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-					var tmp = result.data.split('"')
-					for (var i = 1; i < tmp.length; i = i + 2) {
-						var list = tmp[i].split(",")
-						var data = {
-							goodsName: list[0],
-							newPrice: list[6],
-							openPrice: list[2]
-						}
-						if (data.goodsName) {
-							infoList.push(data)
-						}
-					}
-					let name = 'infoList';
-					let value = infoList;
-					that.$store.commit('$uStore', {
-						name,
-						value
-					});
-					// console.log("infoList",infoList)
-				},
-				fail: function(e) {
-					console.log('error in...')
-					// reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-					reject(e)
-				},
-			})
+			// uni.request({
+			// 	url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+			// 	// url: "https://hq.sinajs.cn/list=C2109",
+			// 	header: {
+			// 		'content-type': 'application/x-www-form-urlencoded'
+			// 	},
+			// 	success: function(result) {
+			// 		// resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+			// 		var tmp = result.data.split('"')
+			// 		for (var i = 1; i < tmp.length; i = i + 2) {
+			// 			var list = tmp[i].split(",")
+			// 			var data = {
+			// 				goodsName: list[0],
+			// 				newPrice: list[6],
+			// 				openPrice: list[2]
+			// 			}
+			// 			if (data.goodsName) {
+			// 				infoList.push(data)
+			// 			}
+			// 		}
+			// 		let name = 'infoList';
+			// 		let value = infoList;
+			// 		that.$store.commit('$uStore', {
+			// 			name,
+			// 			value
+			// 		});
+			// 		// console.log("infoList",infoList)
+			// 	},
+			// 	fail: function(e) {
+			// 		console.log('error in...')
+			// 		// reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+			// 		reject(e)
+			// 	},
+			// })
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;

+ 13 - 12
pages/user/report.vue

@@ -78,7 +78,7 @@
 				</view>
 				<view class="row3" @click="goToPage(2)">
 					<view class="top">
-						合同总额
+						开票情况
 					</view>
 					<view class="bottom">
 						<view class="left">
@@ -116,7 +116,7 @@
 				</view>
 				<view class="row4" @click="goToPage(3)">
 					<view class="top">
-						合同总额
+						结算情况
 					</view>
 					<view class="bottom">
 						<view class="left">
@@ -142,11 +142,11 @@
 									已结算
 									<view class="number">{{dataObj2.percentage}}</view>
 								</view>
-								<view class="right-number">¥{{dataObj5.total}}</view>
+								<view class="right-number">¥{{dataObj2.total}}</view>
 							</view>
 							<view class="bottom">
 								<u-line-progress height="12" active-color="#5C75DF" :show-percent="false"
-									:striped="true" :percent="dataObj5.percent" :striped-active="true">
+									:striped="true" :percent="dataObj2.percent" :striped-active="true">
 								</u-line-progress>
 							</view>
 						</view>
@@ -274,8 +274,8 @@
 				inventoryTC: 0,
 				contractSelect: '0',
 				url: '',
-				nowDate: '2022年全年',
-				seachMoth: '2021',
+				nowDate: '2022年1月',
+				seachMoth: '2022',
 				background: {
 					backgroundColor: '#2E303A',
 				},
@@ -332,10 +332,7 @@
 							label: '2022年'
 						}
 					],
-					[{
-							value: '0',
-							label: '全年'
-						},
+					[
 						{
 							value: '01',
 							label: '1月'
@@ -384,6 +381,10 @@
 							value: '12',
 							label: '12月'
 						},
+						{
+							value: '0',
+							label: '全年'
+						},
 					]
 				],
 				ztList: [],
@@ -398,8 +399,8 @@
 				title: "数据加载中...",
 				mask: true
 			})
-			if (this.nowDate == '2022年全年') {
-				this.seachMoth = '2022'
+			if (this.nowDate == '2022年1月') {
+				this.seachMoth = '2022-01'
 			}
 			this.init()
 		},

+ 34 - 34
websocket_sdk.js

@@ -380,40 +380,40 @@ export default class Websocket {
 			var hour = new Date().getHours();
 			if((hour >= 9 && hour < 12) ||(hour >= 13 && hour < 15)){
 				var infoList = [];
-				uni.request({
-				    url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				    // url: "https://hq.sinajs.cn/list=C2109",
-				    header: {
-				        'content-type': 'application/x-www-form-urlencoded'
-				    },
-				    success: function(result) {
-				        // resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-						var tmp = result.data.split('"')
-						for(var i = 1; i<tmp.length;i=i+2){
-							var list = tmp[i].split(",")
-							var data = {
-								goodsName:list[0],
-								newPrice:list[6],
-								openPrice:list[2]
-							}
-							if(data.goodsName){
-								infoList.push(data)
-							}
-						}
-						let name = 'infoList';
-						let value = infoList;
-						store.commit('$uStore', {
-							name,
-							value
-						});
-						// console.log("infoList",infoList)
-				    },
-				    fail: function(e) {
-				        console.log('error in...')
-				        // reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-				        reject(e)
-				    },
-				})
+				// uni.request({
+				//     url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+				//     // url: "https://hq.sinajs.cn/list=C2109",
+				//     header: {
+				//         'content-type': 'application/x-www-form-urlencoded'
+				//     },
+				//     success: function(result) {
+				//         // resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+				// 		var tmp = result.data.split('"')
+				// 		for(var i = 1; i<tmp.length;i=i+2){
+				// 			var list = tmp[i].split(",")
+				// 			var data = {
+				// 				goodsName:list[0],
+				// 				newPrice:list[6],
+				// 				openPrice:list[2]
+				// 			}
+				// 			if(data.goodsName){
+				// 				infoList.push(data)
+				// 			}
+				// 		}
+				// 		let name = 'infoList';
+				// 		let value = infoList;
+				// 		store.commit('$uStore', {
+				// 			name,
+				// 			value
+				// 		});
+				// 		// console.log("infoList",infoList)
+				//     },
+				//     fail: function(e) {
+				//         console.log('error in...')
+				//         // reject调用后,即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+				//         reject(e)
+				//     },
+				// })
 			}
 		})
 	}