zhangdan 4 anos atrás
pai
commit
7daf25ccb4

+ 2 - 1
App.vue

@@ -16,7 +16,7 @@
 			token: '',
 			version: '', // 当前版本号
 			buildType: buildType,
-			envTips: envTips
+			envTips: envTips,
 		},
 		mounted() {
 			// 非V3模式
@@ -29,6 +29,7 @@
 		},
 		onLaunch: function() {
 			 console.log('App onLaunch')
+			 
 		},
 		onShow: function() {
 			console.log('App Show')

+ 14 - 1
components/select/v-select.vue

@@ -1,6 +1,6 @@
 <template>
 	<picker @change="toChange" :value="index" :range="datalist" range-key="dispName">
-		<view v-if="showBtn" style="color: #666;">取消订单</view>
+		<view v-if="showBtn" class="cancelBtn">取消订单</view >
 		<view v-if="showSelete" style="display: flex;align-items: center;justify-content: space-between;">
 			<input class="form-input" :disabled="disabled" v-model="selected" placeholder-class="form-input-placeholder placeholder" :placeholder="placeholderText" />
 			<u-icon name="arrow-right" color="#c0c4cc"></u-icon>
@@ -122,6 +122,19 @@ export default {
 </script>
 
 <style scoped>
+	.cancelBtn{
+		/* width: 345px; */
+		padding: 20rpx 270rpx;
+		height: 84upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #E5E5E5;
+		color: #666;
+		border-radius: 16upx;
+		font-size: 36upx;
+		font-weight: 500;
+	}
 	/* .placeholder{
 		color:"#c0c4cc" !important
 	} */

+ 4 - 5
pages.json

@@ -16,9 +16,9 @@
 			"path": "pages/index/YY",
 			"style": {
 				"navigationBarTitleText": "下单",
-				"navigationBarBackgroundColor": "#1995FF",
-				"navigationBarTextStyle": "white"
-				 // "navigationStyle":"custom"
+				// "navigationBarBackgroundColor": "#1995FF",
+				// "navigationBarTextStyle": "white"
+				"navigationStyle":"custom"
 			}
 		},
 		{
@@ -38,8 +38,7 @@
 			"path": "pages/index/yuyueResult",
 			"style": {
 				"navigationBarBackgroundColor": "#1995FF",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "下单"
+				"navigationStyle":"custom"
 			}
 		},
 		{

Diferenças do arquivo suprimidas por serem muito extensas
+ 42 - 21
pages/index/YY.vue


+ 10 - 1
pages/index/index.vue

@@ -27,7 +27,7 @@
 			</view> -->
 			<!-- 下单 -->
 			<view class="bottom-order flex justify_between align_center">
-				<view class="order-type flex flex_column justify_center" @click="gotoYueYu">
+				<view class="order-type flex flex_column justify_center" @click="gotoSaoMa">
 					<u-image src="/static/index/home_icon_code.png" width="186rpx" height="144rpx"></u-image>
 					<view class="type type-saoma">扫码下单</view>
 					<view class="type-info">在线下单</view>
@@ -261,6 +261,15 @@
 					}
 				})
 			},
+			// 扫码下单
+			gotoSaoMa(){
+				wx.scanCode({
+				  success: (res)=> {
+				    console.log(res,'----------------res===================')
+				  }
+				})
+			},
+			// 自主下单
 			gotoYueYu(){
 				if(this.hasLogin){
 					uni.navigateTo({

Diferenças do arquivo suprimidas por serem muito extensas
+ 31 - 14
pages/index/yuyueResult.vue


BIN
static/order/bg_order@3x.png


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff