xuqiang 4 лет назад
Родитель
Сommit
7ff6956557
3 измененных файлов с 187 добавлено и 186 удалено
  1. 158 159
      pages.json
  2. 25 21
      pages/Storesettings.vue
  3. 4 6
      pages/Wallet.vue

+ 158 - 159
pages.json

@@ -2,8 +2,7 @@
 	"easycom": {
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/Home",
 			"style": {
 				"navigationStyle": "custom",
@@ -47,154 +46,156 @@
 					"popGesture": "none"
 				}
 			}
-		}, 
-		{
-			"path": "pages/Login",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Register",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Authentication",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},		
-		{
-			"path": "pages/Addstores",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/Addcommodity",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/Storeclassification",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/Addipc",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Review",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Evaluate",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Applicationshop",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Storesettings",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/Storesdetails",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Security",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/Modifyphnoe",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Modifypass",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Setup",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Wallet",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/Walletdetails",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/Standard",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/Mine",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},	
-		{
-			"path": "pages/News",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
+		},
+		{
+			"path": "pages/Login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Register",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Authentication",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Addstores",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Addcommodity",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Storeclassification",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Addipc",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Review",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Evaluate",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Applicationshop",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Storesettings",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+				// "navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Storesdetails",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Security",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Modifyphnoe",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Modifypass",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Setup",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Wallet",
+			"style": {
+				"navigationBarTitleText": ""
+				// "navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Walletdetails",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Standard",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Mine",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/News",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/Orders",
 			"style": {
@@ -202,7 +203,7 @@
 				"enablePullDownRefresh": false
 			}
 		}
-    ],
+	],
 	"preloadRule": {
 		"pages/example/components": {
 			"network": "all",
@@ -240,14 +241,12 @@
 			}
 		]
 	},
-	"condition" : { 
+	"condition": {
 		"current": 0,
-		"list": [
-			{
-				"name": "", 
-				"path": "", 
-				"query": ""
-			}
-		]
+		"list": [{
+			"name": "",
+			"path": "",
+			"query": ""
+		}]
 	}
 }

+ 25 - 21
pages/Storesettings.vue

@@ -1,29 +1,30 @@
 <template>
-	<view>
-		<titlenav></titlenav>
-		<view class="stores">
-			<view class="title">店铺设置</view>
-			<u-cell-group :border="false" class="from">
-				<u-cell-item title="店铺头像" is-link @click="changeLogo">
-					<image class="imgBox" src="https://bpic.588ku.com/illus_water_img/21/07/05/ecab6de5a7b2972500459ba95cf97deb.jpg" mode=""></image>
-				</u-cell-item>
-				<u-cell-item v-if="form.labels == 1" title="店铺标签" is-link @click="chooseSex">接受预约</u-cell-item>
-				<u-cell-item v-if="form.labels == 2" title="店铺标签" is-link @click="chooseSex">不接受预约</u-cell-item>
-				<u-cell-item title="营业时间" is-link>07:00-14:00 14:00-14:00</u-cell-item>
-				<u-field name="店铺电话" label="店铺电话" placeholder="请输入" v-model="form.phone" />
-				<u-field name="起送费(元)" label="起送费(元)" placeholder="请输入" v-model="form.delivery" />
-				<u-field name="配送费(元)" label="配送费(元)" placeholder="请输入" v-model="form.distribution" />
-			</u-cell-group>
-			<view class="characteristic">店家特色</view>
-			<u-field type="textarea" placeholder="请输入" v-model="form.characteristic" />
-			<view class="characteristic">店家公告</view>
-			<u-field type="textarea" placeholder="请输入" v-model="form.notice" />
-			<view class="btn"><u-button block type="primary" @click="submit">保存</u-button></view>
-		</view>
+<!-- 	<view>
+	<titlenav></titlenav> -->
+	<view class="stores">
+		<view class="title">店铺设置</view>
+		<u-cell-group :border="false" class="from">
+			<u-cell-item title="店铺头像" is-link>
+				<image class="imgBox" src="https://bpic.588ku.com/illus_water_img/21/07/05/ecab6de5a7b2972500459ba95cf97deb.jpg" mode=""></image>
+			</u-cell-item>
+			<u-cell-item v-if="form.labels == 1" title="店铺标签" is-link @click="chooseSex">接受预约</u-cell-item>
+			<u-cell-item v-if="form.labels == 2" title="店铺标签" is-link @click="chooseSex">不接受预约</u-cell-item>
+			<u-cell-item title="营业时间" is-link>07:00-14:00 14:00-14:00</u-cell-item>
+			<u-field name="店铺电话" label="店铺电话" placeholder="请输入" v-model="form.phone" />
+			<u-field name="起送费(元)" label="起送费(元)" placeholder="请输入" v-model="form.delivery" />
+			<u-field name="配送费(元)" label="配送费(元)" placeholder="请输入" v-model="form.distribution" />
+		</u-cell-group>
+		<view class="characteristic">店家特色</view>
+		<u-field type="textarea" placeholder="请输入" v-model="form.characteristic" />
+		<view class="characteristic">店家公告</view>
+		<u-field type="textarea" placeholder="请输入" v-model="form.notice" />
+		<view class="btn"><u-button block type="primary" @click="submit">保存</u-button></view>
 	</view>
+	<!-- </view> -->
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import Titlenav from '../components/Titlenav.vue';
 export default {
 	components: {
@@ -36,6 +37,9 @@ export default {
 			}
 		};
 	},
+	// computed: {
+	// 	...mapState(['systemInfo'])
+	// },
 	methods: {
 		chooseSex() {
 			uni.showActionSheet({

+ 4 - 6
pages/Wallet.vue

@@ -1,9 +1,7 @@
 <template>
 	<view class="titlenav">
-		<titlenav :flag="true"></titlenav>
-		<view class="top">
-			<view class="title">财务中心</view>
-		</view>
+		<!-- <titlenav :flag="true"></titlenav> -->
+		<view class="top"><view class="title">财务中心</view></view>
 		<view class="content">
 			<view>
 				<view class="text1">9918.50</view>
@@ -12,7 +10,7 @@
 			<view class="btn" @click="Withdrawal">提现</view>
 		</view>
 		<view class="time">
-			<view class="time2" @click="Times"><input type="text" readonly="readonly" v-model="startTime" /></view>
+			<view class="time2" @click="Times"><input type="text" :readonly="readonly" v-model="startTime" /></view>
 			<view>
 				<text class="text1 text2">收入 ¥6832.50</text>
 				<text class="text1">提现 ¥5200.00</text>
@@ -93,7 +91,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.titlenav{
+.titlenav {
 	background: #214bbe;
 	.top {
 		padding-top: 10px;