'1301'

src/config/index.js

@@ -46,7 +46,7 @@ const DEFAULT_CONFIG = {
 	LANG: 'zh-cn',
 
 	//主题颜色
-	COLOR: '',
+	COLOR: '#20222A',
 
 	//是否加密localStorage, 为空不加密，可填写AES(模式ECB,移位Pkcs7)加密
 	LS_ENCRYPTION: '',

src/layout/index.vue

@@ -63,8 +63,8 @@
 		<header class="adminui-header">
 			<div class="adminui-header-left">
 				<div class="logo-bar">
-					<img class="logo" :src="baseData.logo ? baseData.logo : 'img/logo.png'">
-					<span>{{ baseData.title ? baseData.title : $CONFIG.APP_NAME }}</span>
+					<img class="logo h40" :src="baseData.logo ? baseData.logo : 'img/logo.png'">
+					<!-- <span>{{ baseData.title ? baseData.title : $CONFIG.APP_NAME }}</span> -->
 					<div class="ml10">
 						<el-tag v-if="userInfo.type==1">管理后台</el-tag>
 						<el-tooltip class="box-item" effect="dark" :content="userInfo.vip_at==0?'到期时间：永久':'到期时间：'+$TOOL.getTime(userInfo.vip_at,'YYYY年MM月DD日')" placement="right" v-else>

src/style/app.scss

@@ -582,7 +582,10 @@ fieldset legend {
 .search-form.mt0 .form-left .el-input {
 	margin-bottom: 0;
 }
-
+.line-5{
+	height: 5px;
+	width: 100%;
+}
 .search-form .form-line {
 	display: flex;
 	min-width: 1px;
@@ -594,7 +597,7 @@ fieldset legend {
 	vertical-align: middle;
 	border-left: 1px solid var(--el-color-info-light-9);
 }
-.text-center{text-align: center;}
+
 .search-form .form-right {
 	flex: 0 0 86px;
 	text-align: right;
@@ -605,8 +608,6 @@ fieldset legend {
 	text-align: right;
 }
 
-.line-5{height: 5px;width: 100%;}
-
 .search-form .form-right .el-button {
 	margin-bottom: 10px;
 }
@@ -672,6 +673,7 @@ fieldset legend {
 .dark .adminui-header .logo-bar{
 	color: #fff;
 }
+.h40{height: 36px !important;}
 
 .tip-container {
 	margin: 20px 0;

src/views/login/components/passwd.vue

@@ -87,12 +87,12 @@ export default {
 			//获取token
 			this.islogin = true
 			var user = await this.$API.auth.login.post(data)
-			this.islogin = false
 			if (user.code == 1) {
 				this.$TOOL.cookie.set("TOKEN", user.data.access_token, {
 					expires: user.data.expires_in
 				})
 			} else {
+				this.islogin = false
 				this.$message.error(user.msg)
 				return false
 			}

src/views/manage/setting/basic/index.vue

@@ -103,7 +103,7 @@
                 </el-card>
         </el-main>
         <el-footer style="text-align: right;">
-            <el-button type="primary" :loading="isSaveing" @click="saveForm">保存</el-button>
+            <el-button type="primary" size="large" :loading="isSaveing" @click="saveForm">保存</el-button>
         </el-footer>
     </el-container>
 </template>
@@ -116,7 +116,7 @@ export default {
     },
     data(){
         return {
-            activeName:"wechat",
+            activeName:"service",
             isSaveing: false,
             sys: {},
             smsRegion:[],

src/views/manage/setting/menu/save.vue

@@ -41,7 +41,7 @@
 						<el-input v-model="form.sort" clearable placeholder=""></el-input>
 					</el-form-item>
 					<el-form-item>
-						<el-button type="primary" @click="save" :loading="loading">保 存</el-button>
+						<el-button type="primary" size="large" @click="save" :loading="loading">保 存</el-button>
 					</el-form-item>
 				</el-form>
 

src/views/manage/setting/storage/index.vue

@@ -178,7 +178,7 @@
             </el-card>
         </el-main>
         <el-footer>
-            <el-button type="primary" :loading="isSaveing" @click="saveForm">保存</el-button>
+            <el-button type="primary" size="large" :loading="isSaveing" @click="saveForm">保存</el-button>
         </el-footer>
     </el-container>
 </template>

src/views/manage/shop/index/components/form.vue

@@ -38,13 +38,13 @@
                                 <el-form-item label="营业时间">
                                     <el-row :gutter="10">
                                         <el-col :span="11">
-                                            <el-time-select v-model="formData.start_at" start="00:30" step="00:15" end="23:30" placeholder="请选择"  style="width: 100%"/>
+                                            <el-time-select v-model="formData.start_at" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
                                         </el-col>
                                         <el-col :span="2" class="text-center">
                                             <span class="text-gray-500">-</span>
                                         </el-col>
                                         <el-col :span="11">
-                                            <el-time-select v-model="formData.end_at" start="00:30" step="00:15" end="23:30" placeholder="请选择"  style="width: 100%"/>
+                                            <el-time-select v-model="formData.end_at" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
                                         </el-col>
                                     </el-row>
                                     <div class="el-form-item-msg">营业时间为必选，否则小程序端无法下单</div>
@@ -95,34 +95,11 @@
                             <div class="el-form-item-msg">如果类型为金额比例，比例设置10，则表示抽取每单金额的10%为系统佣金，最多不超过100</div>
                         </el-form-item>
                     </fieldset>
-                    <fieldset v-if="mode=='add'">
-                        <legend><el-tag>账号权限</el-tag></legend>
-                        <el-row :gutter="15">
-                            <el-col :span="24">
-                                <el-form-item label="登录用户账号" prop="userame">
-                                    <el-input v-model="formData.userame" clearable placeholder="请输入"></el-input>
-                                    <div class="el-form-item-msg"></div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="新的登录密码" prop="password">
-                                    <el-input v-model="formData.password" clearable placeholder="请输入"></el-input>
-                                    <div class="el-form-item-msg"></div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="重复登录密码" prop="password2">
-                                    <el-input v-model="formData.password2" clearable placeholder="请输入"></el-input>
-                                    <div class="el-form-item-msg"></div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </fieldset>
                 </el-form>
             </el-main>
             <el-footer style="text-align: right;">
-                <el-button @click="visible=false" >取 消</el-button>
-                <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="submit()">保 存</el-button>
+                <el-button @click="visible=false" size="large">取 消</el-button>
+                <el-button v-if="mode!='show'" size="large" type="primary" :loading="isSaveing" @click="submit()">保 存</el-button>
             </el-footer>
         </el-container>
     </el-drawer>
@@ -159,6 +136,9 @@ export default {
                 shop_mobile: [
                     {required: true, message: '请输入'}
                 ],
+                shop_address: [
+                    {required: true, message: '请输入'}
+                ],
                 start_at: [
                     {required: true, message: '请选择'}
                 ],

src/views/manage/shop/index/components/table.vue

@@ -34,7 +34,7 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="店铺地址" prop="shop_address">
+        <el-table-column label="店铺地址" prop="shop_address" width="300">
             <template #default="scope">
                 <span v-if="scope.row.shop_address">{{ scope.row.shop_address }}</span>
                 <span class="status-danger" v-else>未设置</span>