Преглед на файлове

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

gjy преди 3 години
родител
ревизия
7952c178d2
променени са 5 файла, в които са добавени 39 реда и са изтрити 24 реда
  1. 4 0
      .hbuilderx/launch.json
  2. 2 2
      manifest.json
  3. 6 1
      pages/erpbusiness/add_quality_testing.vue
  4. 1 1
      pages/sale/information.vue
  5. 26 20
      pages/user/report.vue

+ 4 - 0
.hbuilderx/launch.json

@@ -14,6 +14,10 @@
      	{
      		"launchtype" : "remote"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
      	"type" : "uniCloud"
      }
     ]

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.51",
-    "versionCode" : 1151,
+    "versionName" : "1.1.53",
+    "versionCode" : 1153,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 6 - 1
pages/erpbusiness/add_quality_testing.vue

@@ -486,7 +486,12 @@
 								that.gridList.tidalGrainPrice = ''
 							}
 						} else {
-							that.gridList.tidalGrainPrice = res.data.data
+							if(that.gridList.type == '干粮'){
+								that.gridList.dryGrainPrice = res.data.data
+							}
+							else{
+								that.gridList.tidalGrainPrice = res.data.data
+							}
 						}
 					})
 				}

+ 1 - 1
pages/sale/information.vue

@@ -25,7 +25,7 @@
 				<text class="num">{{swiperLength}}</text>
 			</view> -->
 		</view>
-		<swiper-up :list="infoList"></swiper-up>
+		<!-- <swiper-up :list="infoList"></swiper-up> -->
 		<view class="guess-section-wrap">
 			<view class='flex justify-between'>
 				<view class='title Medium'>工厂价格</view>

+ 26 - 20
pages/user/report.vue

@@ -214,7 +214,7 @@
 				</maoScroll>
 			</view> -->
 			<view class="content7">
-				<view ref='scroll' class='scroll'>
+				<view ref='scroll' class='scroll' :style="{'top':'-'+scrollTop+'px'}">
 					<view class="row1" v-for="(item,index) in ztList">
 						<view class="zt">
 							<view class="point"></view>在途
@@ -243,7 +243,8 @@
 		},
 		data() {
 			return {
-				carInterval: '',
+				scrollTop: 0,
+				carInterval: null,
 				inventoryCost: '',
 				inventoryValue: '',
 				contractSelect: '0',
@@ -371,10 +372,10 @@
 			}
 		},
 		onLoad: function(option) {
-			// uni.showLoading({
-			// 	title: "数据加载中...",
-			// 	mask: true
-			// })
+			uni.showLoading({
+				title: "数据加载中...",
+				mask: true
+			})
 			if (this.nowDate == '2022年全年') {
 				this.seachMoth = '2022'
 			}
@@ -383,6 +384,10 @@
 		destroyed() {
 			clearInterval(this.carInterval)
 		},
+		onUnload() {
+			debugger
+			clearInterval(this.carInterval)
+		},
 		methods: {
 			goToPage(index) {
 				console.log(index)
@@ -761,33 +766,34 @@
 				})
 			},
 			scroll() {
-				let _scroll = 0
 				let that = this
 				let _outHeight = ''
 				let _inHeight = ''
 				let obj = uni.createSelectorQuery().select('.content7')
-				obj.boundingClientRect(function(data) { // data - 各种参数
+				obj.boundingClientRect(function(data) {
 					console.log(data)
 					_outHeight = data.height
 				}).exec()
 				setTimeout(function() {
 					let obj1 = uni.createSelectorQuery().select('.scroll')
-					obj1.boundingClientRect(function(data) { // data - 各种参数
+					obj1.boundingClientRect(function(data) {
 						console.log(data)
 						_inHeight = data.height
 					}).exec()
-					that.carInterval = setInterval(function() {
-						_scroll++
-						console.log(_scroll)
-						if (_scroll < _inHeight - _outHeight) {
-							that.$refs.scroll.$el.style.top = '-' + _scroll + 'px'
+					that.carInterval = setInterval(() => {
+						console.log('···················')
+						console.log("_scroll", that.scrollTop)
+						console.log('_inHeight', _inHeight)
+						console.log('_outHeight', _outHeight)
+						if (that.scrollTop < _inHeight - _outHeight) {
+							that.scrollTop++
+							// console.log(that.$refs)
+							// that.$refs.scroll.$el.style.top = '-' + _scroll + 'px'
 						} else {
-							_scroll = 0
+							that.scrollTop = 0
 						}
-					}, 50)
-
-				}, 0)
-
+					}, 100)
+				}, 10)
 			},
 			confirm(e) {
 				console.log(e)
@@ -1028,7 +1034,7 @@
 	.content7 {
 		position: relative;
 		overflow: hidden;
-		height: 400rpx;
+		height: 520rpx;
 		margin-top: 20rpx;
 
 		.scroll {