소스 검색

title color and commit check

zizhong.wang 3 년 전
부모
커밋
aec256949c
4개의 변경된 파일36개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 1
      pages.json
  2. 32 2
      pages/makeField/fieldForm.vue
  3. 2 2
      pages/makeField/index.vue
  4. 1 1
      pages/makeField/viewDetail.vue

+ 1 - 1
pages.json

@@ -251,7 +251,7 @@
 		{
 			"path": "pages/makeField/index",
 			"style": {
-				"navigationBarTitleText": "党群会议"
+				"navigationBarTitleText": "约场地"
 			}
 		},
 		{

+ 32 - 2
pages/makeField/fieldForm.vue

@@ -160,11 +160,36 @@ export default {
 		  !this.company.tel 
 		){
 		  uni.showToast({
-		    title: "联系信息不完善",
+		    title: "联系信息不完善",
 		    icon: "error",
 		  });
 		  return;
 		}
+		
+		if ( !this.supplyInfo.name){
+		  uni.showToast({
+		    title: "公司信息不完善!",
+		    icon: "error",
+		  });
+		  return;
+		}
+		
+		if (!Number(this.supplyInfo.nums)) {
+		  uni.showToast({
+		    title: "请正确填写活动人数!",
+		    icon: "error",
+		  });
+		  return;
+		}
+		
+		if (!this.imgIdList.join()){
+		  uni.showToast({
+		    title: "资料未上传!",
+		    icon: "error",
+		  });
+		  return;
+		}
+		
 		this.subscribeFn()
     },
 	subscribeFn(){ //订阅通知消息
@@ -172,6 +197,7 @@ export default {
 		uni.requestSubscribeMessage({
 		  tmplIds: [
 		  //"XQcYMt2Tz4OZnrpXMTjetRIwPVftkJeM_XUkNPBtu8c",
+		  //"ctLFsDd_HZ-lemoovoRPZAqjS8-1Gh2ELFSVz4FYtUY"    //第一次上线的时候把这两个都放开,然后再去掉这一条
 		   "iZ3IABacOX7-EjGIyKnPtX2x3eJoYcwVqsOdEdRGvqU",//测试环境模板id
 		  ],
 		  success(res) {
@@ -224,7 +250,9 @@ export default {
 		      uni.setStorageSync("supply_name", this.company.name);
 		      uni.setStorageSync("supply_tel", this.company.tel);
 		      setTimeout(() => {
-		        uni.navigateBack({});
+		        uni.navigateTo({
+		          url: "/pages/makeField/viewDetail?id=" + this.timeObj.id,
+		        });
 		      }, 1500);
 		    } else {
 		      uni.showToast({
@@ -395,6 +423,7 @@ export default {
     box-shadow: rgba(100, 100, 111, 0.2) 14rpx 14rpx 40rpx 14rpx;
 	margin: 30rpx 0 30rpx 0;
 	color: #7f7f7f;
+	font-weight: 300;
     .area {
       height: 200rpx;
       padding: 20rpx;
@@ -476,6 +505,7 @@ export default {
     padding: 2% 4%;
     box-shadow: rgba(100, 100, 111, 0.2) 14rpx 14rpx 40rpx 14rpx;
 	color: #7f7f7f;
+	font-weight: 300;
   }
   .submit {
     color: white;

+ 2 - 2
pages/makeField/index.vue

@@ -21,7 +21,7 @@
 			  </view>
 			 <view class="field-btn-box">
 				 <button  :class="{
-					close: field.order_status == '未开放',
+					close: field.order_status == '今日未开放',
 					free: field.order_status == '空闲',
 					full: field.order_status == '今日已满',
 					can: field.order_status == '今日可约',}">
@@ -147,7 +147,7 @@ export default {
 			font-size: 32rpx;
 		}
         .time {
-			font-weight: 100;
+			font-weight: 300;
 			font-size: 24rpx;
 			color: #7f7f7f;
 			height: 60%;

+ 1 - 1
pages/makeField/viewDetail.vue

@@ -6,7 +6,7 @@
 			<view>{{ areaObj.name }}</view>	
         </view>
 		 <button  :class="{
-			close: areaObj.order_status == '未开放',
+			close: areaObj.order_status == '今日未开放',
 			free: areaObj.order_status == '空闲',
 			full: areaObj.order_status == '今日已满',
 			can: areaObj.order_status == '今日可约',}">