Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-huozhuapp

.hbuilderx/launch.json

@@ -19,7 +19,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]

pages/cargoTerminal/cargoTerminal.vue

@@ -45,28 +45,28 @@
 						<!-- {{item.carModel?item.carModel.replace(',','/'):''}}、{{item.carLength?item.carLength.replace(',','/'):''}}米、10吨/10方、10车... -->
 					</view>
 					<view class="row4 flex row">
-						<view class="btn" @click.native.stop="shelvesBtnClick(1,item)" v-if="item.status=='已下架'&&tabIndex!=2">
+						<view class="btn" @click.stop="shelvesBtnClick(1,item)" v-if="item.status=='已下架'&&tabIndex!=2">
 							上架
 						</view>
-						<view class="btn" @click.native.stop="shelvesBtnClick(2,item)" v-if="item.status=='已上架'&&tabIndex!=2">
+						<view class="btn" @click.stop="shelvesBtnClick(2,item)" v-if="item.status=='已上架'&&tabIndex!=2">
 							下架
 						</view>
-						<view class="btn" @click.native.stop="copyToNewPage(item,1)" v-if="tabIndex==1||tabIndex==2">
+						<view class="btn" @click.stop="copyToNewPage(item,1)" v-if="tabIndex==1||tabIndex==2">
 							复制
 						</view>
-						<view class="btn" @click.native.stop="often(item)" v-if="tabIndex==1&&item.oftenFlag1!=1">
+						<view class="btn" @click.stop="often(item)" v-if="tabIndex==1&&item.oftenFlag1!=1">
 							常发
 						</view>
 						<view class="btn often" v-if="tabIndex==1&&item.oftenFlag1==1">
 							常发
 						</view>
-						<view class="btn" @click.native.stop="deleteTask(item)" v-if="tabIndex!=2">
+						<view class="btn" @click.stop="deleteTask(item)" v-if="tabIndex!=2">
 							删除
 						</view>
-						<view class="btn" @click.native.stop="editTask(item)" v-if="tabIndex!=2">
+						<view class="btn" @click.stop="editTask(item)" v-if="tabIndex!=2">
 							编辑
 						</view>
-						<view class="btn" @click.native.stop="removeOften(item)" v-if="tabIndex==2">
+						<view class="btn" @click.stop="removeOften(item)" v-if="tabIndex==2">
 							移除
 						</view>
 					</view>
@@ -120,7 +120,7 @@
 				goodsList: [],
 				customStyleButton: {
 					position: "fixed",
-					bottom: "140rpx",
+					bottom: "60rpx",
 					margin: "0 20rpx",
 					width: "calc(100vw - 40rpx)"
 				},
@@ -421,7 +421,7 @@
 
 	.btn {
 		border: 1px solid rgb(255, 134, 0);
-		padding: 10rpx;
+		padding: 10rpx 20rpx;
 		box-sizing: border-box;
 		margin-left: 10rpx;
 		color: rgb(255, 134, 0);

pages/cargoTerminal/cargoTerminalDetail.vue

@@ -161,7 +161,7 @@
 					信息费
 				</view>
 				<view class="right">
-					{{dataObj.stationFee}}
+					{{dataObj.stationFee}}元
 				</view>
 			</view>
 		</view>

pages/cargoTerminal/publishSource.vue

@@ -225,7 +225,7 @@
 							inputAlign='right'></u--input>
 					</u-form-item>
 					<u-form-item label="联系人电话" borderBottom labelWidth="160rpx">
-						<u--input v-model="dataObj.contactsPhone" border="none" placeholder="输入联系人姓名"
+						<u--input v-model="dataObj.contactsPhone" border="none" placeholder="输入联系人"
 							inputAlign='right'></u--input>
 					</u-form-item>
 					<u-form-item label="货站名称" labelWidth="140rpx">
@@ -955,14 +955,16 @@
 				let timestamp = new Date(new Date().toLocaleDateString()).getTime();
 				let basetime = 24 * 60 * 60 * 1000;
 				for (let i = 0; i < 8; i++) {
+					
 					let _date = timestamp + basetime * i
+					console.log(new Date(_date).toLocaleDateString())
 					let _obj = {
-						date: new Date(_date).toLocaleDateString().substring(5).replace("/", "."),
+						date: new Date(_date).getMonth()+1+"."+new Date(_date).getDate(),
 						index: i,
 						checked: false,
 					}
 					this.dateList.push(_obj)
-					console.log("this.dateList", this.dateList)
+					console.log("t_obj", _obj)
 				}
 				console.log(this.dateList)