样式优化

App.vue

@@ -80,16 +80,7 @@ export default {
 
 <style lang="scss">
 	@import "uview-ui/index.scss";
-	/*
-1.页面背景颜色#f7f7f7
-2.分隔线颜色#DBDBDB
-3.正常字体颜色#333333
-4.灰色字体颜色#666666或者#999999
-5.主题颜色#3688FF
-6.正常字体大小28rpx,偏小一点的24rpx
-8.页面最外层与里面的第一层为padding:0 12px;
-9.css单位为rpx
-*/
+	
 	page {
 		font-size: 28rpx;
 		color: #333333;

components/orderCoupon.vue

@@ -135,8 +135,8 @@ export default{
 <style scoped="scoped" lang="scss">
 	.title{display: flex;height: 80rpx;}
 	.titleContent{flex:1;text-align: center;font-size:30rpx;}
-	.titleContent.on{color: $blue;font-weight: bold;}
-	.titleContent view text{width: 40rpx;height: 6rpx;background:$blue;border-radius:6rpx;display:inline-block;position: relative;top:-10rpx;}
+	.titleContent.on{color: $theme;font-weight: bold;}
+	.titleContent view text{width: 40rpx;height: 6rpx;background:$theme;border-radius:6rpx;display:inline-block;position: relative;top:-10rpx;}
 	.middle{padding:24rpx;background:#f5f5f5;}
 	.listBox{background: #FFFFFF;padding:24rpx;border-radius:10rpx;}
   .middle .listBox:not(:first-child){margin-top:20rpx;}

pages/album/albumOrderdetail/albumOrderdetail.vue

@@ -365,7 +365,7 @@ export default {
 .button{
 	width: 144rpx;
 	height: 64rpx;
-	background: $blue;
+	background: $theme;
 	border-radius:8rpx;
 	display: inline-block;
 	color:#ffffff;
@@ -411,7 +411,7 @@ export default {
 	display: inline-block;
 	width: 212rpx;
 	height: 80rpx;
-	background:$blue;
+	background:$theme;
 	border-radius: 44rpx;
 	text-align: center;
 	line-height: 80rpx;

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -344,7 +344,7 @@ export default {
 	padding-right: 40rpx;
 }
 .search-btn {
-	background: $blue;
+	background: $theme;
 	color: #fff;
 	border-radius: 32rpx;
 	padding: 12rpx 24rpx;
@@ -388,8 +388,8 @@ export default {
 	justify-content: space-between;
 }
 .right2-left text{
-	color: $blue;
-	border: 1px solid $blue;
+	color: $theme;
+	border: 1px solid $theme;
 	font-size: 20rpx;
 	padding: 2rpx 4rpx;
 	border-radius: 2rpx;

pages/my/takeNumber/numberChoose/numberChoose.vue

@@ -125,7 +125,7 @@ export default {
 	white-space: nowrap;
 }
 .choose-content.on{
-	background: $blue;
+	background: $theme;
 	color: #ffffff;
 }
 .choose-name{

pages/payment/orderPayment/orderPayment.vue

@@ -95,10 +95,6 @@ export default {
     } else {
       this.login() //极个别手机从公众号跳转回来没有openid,再次获取openid
     }
-    console.log(111)
-  },
-  onShow() {
-    console.log(222)
   },
   methods: {
     login() {

pages/scenic/combinationProduct/combinationProduct.vue

@@ -660,7 +660,7 @@ export default {
 }
 .tabbar .on {
 	// background: url('../../../static/img/scenic/tabbar.png') no-repeat;
-	background: $blue;
+	background: $theme;
 	background-size: 100% 100%;
 	color: #fff;
 	font-weight: bold;
@@ -750,7 +750,7 @@ export default {
 	align-items: center;
 }
 .product-rule {
-	color: $blue;
+	color: $theme;
 }
 .product-rule::after {
 	display: inline-block;

pages/scenic/scenicOrder/scenicOrder.vue

@@ -110,17 +110,16 @@
 
 					<view>
 						<u-number-box
-							button-size="36"
-							inputWidth="40"
+							@change='buyNumChange'
+							v-model="buyNum" 
+							bg-color='#3688FF' 
+							color='#ffffff' 
+							iconStyle='color:#ffffff;font-size:32rpx;'
+							buttonSize='60'
+							input-width="100"
 							:min="1"
-							:max="maxBookNum"
-							integer
-							v-model="buyNum"
-							@change="buyNumChange"
-							color="#fff"
-							bgColor="#3688FF"
-							iconStyle="color: #fff"
-						></u-number-box>
+							:max="maxBookNum">
+						</u-number-box>
 					</view>
 				</view>
 			</view>
@@ -147,8 +146,7 @@
 					<view class="visitorTitle">
 						<text> 游客信息 </text>
 						<text>
-							需填<text class="title-bold">{{ contactNum }}</text
-							>位出行人
+							需填<text class="title-bold">{{ contactNum }}</text>位出行人
 							<text class="title-bold" v-if="contactNum - orderTouristList.length > 0">，还需{{ contactNum - orderTouristList.length }}位</text>
 						</text>
 					</view>
@@ -273,12 +271,10 @@
 					<text v-if="productIfo.status == 1">已下架</text>
 					<text v-if="parseInt(maxBookNum) <1" style="background: #c0c0c0">暂无库存</text>
 					<text v-if="productIfo.status != 1 && parseInt(maxBookNum) >= 1" @click="jugeOrder()">去支付</text>
-					<text class="btn-paying" v-show="showPaying">支付中...</text>
-					<text class="mask" v-show="showPaying"></text>
 				</view>
 			</view>
 		</view>
-		<!-- <calendar ref="calendar" @dateConfig="dateConfig" :dateList="dateList" v-if="dateList.length > 0"></calendar> -->
+		<calendar ref="calendar" @dateConfig="dateConfig" :dateList="dateList" v-if="dateList.length > 0"></calendar>
 		<buyKnow ref="buyKnow" :buyKnowData="buyKnowData"></buyKnow>
 		<detail
 			ref="detail"
@@ -413,7 +409,6 @@ export default {
       companyId: '', //公司Id
       docQuery: '', //元素变量
       payBackground: '', //支付按钮背景颜色
-      showPaying: false, //是否显示支付中按钮
       dateScroll: '', //日期滚动值
       timeScroll: '' //时间滚动值
     }
@@ -478,9 +473,6 @@ export default {
     }
   },
   methods: {
-    xxx(){
-      console.log(123)
-    },
     //---获取排号信息
     getSortInfor() {
       let data = {
@@ -602,12 +594,9 @@ export default {
         return item.startTime.substr(0, 10) == data
       })
       this.dateChoose(index) //选中确认的日期
-      this.docQuery
-        .selectAll('.date-list')
-        .boundingClientRect(data => {
-          this.dateScroll = (data[index].width + 4) * index
-        })
-        .exec()
+      this.docQuery.selectAll('.date-list').boundingClientRect(data => {
+        this.dateScroll = (data[index].width + 4) * index
+      }).exec()
     },
     //---展示更多时间
     showTime() {
@@ -730,7 +719,6 @@ export default {
     },
     //---展示购票须知
     showBuyKnow() {
-      console.log(111)
       this.$refs.buyKnow.buyKnowShow = true
     },
     //---页面初始化数据，获取产品基本信息
@@ -839,9 +827,9 @@ export default {
             if (this.dateList.length == 1 && this.beforeBookDays == 0) {
               //长度为1而且只能预订当天，默认选中第一个日期
               //真机模拟的时候手机端不显示今天，明天后天，延迟执行
-              // setTimeout(item => {
-              //   this.$refs.calendar.defaultDate = this.dateList[0].startTime.substr(0, 10)
-              // }, 1000)
+              setTimeout(item => {
+                this.$refs.calendar.defaultDate = this.dateList[0].startTime.substr(0, 10)
+              }, 1000)
               this.maxBookNum = Math.min(this.dateList[0].surplus, this.productIfo.maxBookNum) //剩余量
               this.startDate = this.dateList[0].startTime //开始日期
               this.endDate = this.dateList[0].endTime //结束日期
@@ -1132,10 +1120,6 @@ export default {
           return
         }
       }
-      this.showPaying = true
-      setTimeout(() => {
-        this.showPaying = false
-      }, 6000)
       // this.preOrder()
     },
     //---预下单
@@ -1355,7 +1339,7 @@ export default {
 }
 
 .date-list.on {
-	border: 1px solid var(--main-color);
+	border: 1px solid $theme;
 }
 
 .no-date {
@@ -1392,7 +1376,7 @@ export default {
 	display: inline-block;
 	width: 30rpx;
 	height: 28rpx;
-	background: var(--main-color);
+	background:$theme;
 	border-radius: 10rpx 0;
 }
 
@@ -1409,7 +1393,7 @@ export default {
 
 .date-more-content {
 	margin: 0 4rpx;
-	color: var(--main-color);
+	color: $theme;
 }
 
 .middle1Time {
@@ -1757,20 +1741,6 @@ export default {
 	color: #ffffff;
 	top: 0;
 }
-
-.btn-paying {
-	z-index: 1;
-	background: #c0c0c0;
-	border-radius: 16rpx;
-}
-.btn .mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.1);
-}
 .sortPoptext {
 	font-size: 30rpx;
 	font-weight: bolder;

uni.scss

@@ -12,74 +12,28 @@
  *
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
-/*分割线颜色*/
-$divider:#DBDBDB;
+
+/*
+1.页面背景颜色#f7f7f7
+2.分隔线颜色#DBDBDB
+3.正常字体颜色#333333
+4.灰色字体颜色#666666或者#999999
+5.主题颜色#3688FF
+6.正常字体大小28rpx,偏小一点的24rpx
+8.页面最外层与里面的第一层为padding:0 12px;
+9.css单位为rpx
+*/
+
 /*主题颜色*/
-$blue:#3688FF;
+$theme:#3688FF;
+
 /*红色*/ 
 $red:#FC6703;
+
 /*灰色*/ 
 $grey:#999;
 
-/* 颜色变量 */
-
-/* 行为相关颜色 */
-$uni-color-primary: #007aff;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$text-grey:#999;//辅助灰色，如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
-
-/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
-
-/* 边框颜色 */
-$border-color:#c8c7cc;
-
-/* 尺寸变量 */
-
-/* 文字尺寸 */
-$uni-font-size-sm:24rpx;
-$uni-font-size-base:28rpx;
-$uni-font-size-lg:32rpx;
-
-/* 图片尺寸 */
-$uni-img-size-sm:40rpx;
-$uni-img-size-base:52rpx;
-$uni-img-size-lg:80rpx;
-
-/* Border Radius */
-$uni-border-radius-sm: 4rpx;
-$uni-border-radius-base: 6rpx;
-$uni-border-radius-lg: 12rpx;
-$uni-border-radius-circle: 50%;
-
-/* 水平间距 */
-$uni-spacing-row-sm: 10px;
-$uni-spacing-row-base: 20rpx;
-$uni-spacing-row-lg: 30rpx;
-
-/* 垂直间距 */
-$uni-spacing-col-sm: 8rpx;
-$uni-spacing-col-base: 16rpx;
-$uni-spacing-col-lg: 24rpx;
+// 分割线颜色
+$divider:#DBDBDB;
 
-/* 透明度 */
-$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
-/* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:40rpx;
-$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:36rpx;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30rpx;
\ No newline at end of file