Merge branch 'master' of http://gitea.intra.yunpaper.com/kuaileadmin/acupuncture_register_system_uniapp

components/inputBox.vue

@@ -2,7 +2,7 @@
   <view class="input-com">
 	<view :class="'input-wrapper'+(errormsg?' error':'')">
 		<view class="left">
-			<text :class="!required?'hide-start':''">*</text>
+			<text :class="!required?'hide-start':''"><img :src="cssUrl+'hua.svg'" class="hua"></text>
 			<view>{{label}}：</view>
 		</view>
 		<view class="right">
@@ -45,7 +45,8 @@ export default {
   },
   data() {
     return {
-		errormsg:''
+		errormsg:'',
+		cssUrl:this.cssUrl
     }
   },
   methods: {
@@ -144,5 +145,9 @@ export default {
 			width: 666rpx;
 			margin: 16rpx auto 0rpx;
 		}
+		.hua{
+			width: 20rpx;
+			height: 20rpx;
+		}
 	}
 </style>

pages.json

@@ -1,13 +1,10 @@
 {
 	"pages": [
 		{
-            "path" : "pages/prebook/prebook",
+			"path": "pages/index/index",
-            "style" :                                                                                    
+			"style": {
-            {
+				"navigationBarTitleText": ""
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
 			}
-            
 		},
 		{
             "path" : "pages/modify_visitor/modify_visitor",
@@ -18,17 +15,19 @@
             }
         },
         {
-            "path" : "pages/visitors/visitors",
+            "path" : "pages/prebook/prebook",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "请选择就诊人",
+                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
         },
         {
-			"path": "pages/index/index",
+            "path" : "pages/visitors/visitors",
-			"style": {
+            "style" :                                                                                    
-				"navigationBarTitleText": ""
+            {
+                "navigationBarTitleText": "请选择就诊人",
+                "enablePullDownRefresh": false
             }
         },
 		{

pages/prebook/prebook.vue

@@ -76,7 +76,17 @@
 			Book,
 			SliderBox
 		},
+		onShow() {
+			
+		},
 		methods: {
+			tips(){
+				uni.showToast({
+					title:"成功预约8人",
+					mask:true,
+					image:this.cssUrl+'gou.svg'
+				})
+			},
 			closeConfirm() {
 				this.$refs.sliderbox.closeConfirm()
 			},