Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/App.vue

@@ -163,8 +163,8 @@ export default {
     setUserData(userInfo) {
       if (userInfo && userInfo.token) {
         // 如果已经登录则直接获取相关信息
-		this.$u.vuex('vuex_token',userInfo.token);
-		this.$u.vuex('vuex_token',"RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5");
+		this.$u.vuex('vuex_token',userInfo.token);
+		this.$u.vuex('vuex_token',"RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5");
 		this.$u.vuex('vuex_user', userInfo);
 		this.$u.vuex('vuex_wx_uid', userInfo.wxopenid);
       } else {

src/components/createCom/XhInput.vue

 <!-- *******************  输入框  *******************  -->
 <template>
 	<view>
-		<u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :border="true" placeholder="请输入" />
+		<u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :placeholder="placeholder" placeholder-style="placeholderStyle"
+		custom-style="customStyle"/>
 	</view>
 </template>
 
@@ -11,7 +12,12 @@
 		name: 'XhInput', // 新建 input
 		components: {},
 		mixins: [stringMixin],
-		props: {},
+		props: {
+			placeholder: {
+				type: String,
+				default: '请输入'
+			}
+		},
 		data() {
 			return {}
 		},
@@ -22,6 +28,16 @@
 				} else {
 					return 'text'
 				}
+			},
+			placeholderStyle() {
+				return 'color:#FFFFFF;font-size:26rpx'
+			},
+			customStyle() {
+				return {
+					'background-color': '#F4F5F7',
+					'border-radius': '12rpx',
+					'color': '#ff0000'
+				}
 			}
 		},
 		watch: {},

src/pages/order/complete.vue

 <template>
-    <view>
+    <view class="com-content">
         <view class="u-wrap" v-if="!takeStatus">
             <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
             <u-tabs-swiper ref="tabs" :current="tabIndex" name="panelName" :list="list"  @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="120"></u-tabs-swiper>
@@ -502,6 +502,10 @@
 
     .class-item {
         padding: 50rpx;
+		margin-bottom: 30rpx;
+		background-color: #fff;
+		padding: 30rpx;
+		border-radius: 8rpx;
         .title {
             font-weight: bold;
             font-size: 32rpx;
@@ -538,6 +542,10 @@
         /* #endif */
         display: flex;
         flex-direction: column;
+		background-color: #FFFFFF;
+		background-image: linear-gradient(to top, #2272ff 0%, #2272ff 100%);
+		background-size: 750rpx 600rpx;
+		background-repeat: no-repeat;
     }
 
     .u-search-box {
@@ -548,6 +556,7 @@
         flex: 1;
         display: flex;
         overflow: hidden;
+		border-radius: 12rpx 12rpx 0 0;
     }
 
     .u-search-inner {
@@ -611,13 +620,6 @@
         padding: 16rpx;
     }
 
-    .class-item {
-        margin-bottom: 30rpx;
-        background-color: #fff;
-        padding: 16rpx;
-        border-radius: 8rpx;
-    }
-
     .class-item:last-child {
         min-height: 100vh;
     }