'0005'

src/layout/index.vue

@@ -63,11 +63,7 @@
 		<header class="adminui-header">
 			<div class="adminui-header-left">
 				<div class="logo-bar">
-<<<<<<< HEAD
 					<img class="logo h40" :src="baseData.logo ? baseData.logo : 'img/logo.png'">
-=======
-					<img class="logo" :src="baseData.logo ? baseData.logo : 'img/logo.png'">
->>>>>>> 03cbf28cdc38d7763e084276112a40ebb2bc351f
 					<!-- <span>{{ baseData.title ? baseData.title : $CONFIG.APP_NAME }}</span> -->
 					<div class="ml10">
 						<el-tag v-if="userInfo.type==1">管理后台</el-tag>

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

@@ -38,21 +38,13 @@
                                 <el-form-item label="营业时间">
                                     <el-row :gutter="10">
                                         <el-col :span="11">
-<<<<<<< HEAD
                                             <el-time-select v-model="formData.start_at" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
-=======
-                                            <el-time-select v-model="formData.start_at" :max-time="formData.end_at" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
->>>>>>> 03cbf28cdc38d7763e084276112a40ebb2bc351f
                                         </el-col>
                                         <el-col :span="2" class="text-center">
                                             <span class="text-gray-500">-</span>
                                         </el-col>
                                         <el-col :span="11">
-<<<<<<< HEAD
                                             <el-time-select v-model="formData.end_at" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
-=======
-                                            <el-time-select v-model="formData.end_at" :min-time="formData.start_at" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
->>>>>>> 03cbf28cdc38d7763e084276112a40ebb2bc351f
                                         </el-col>
                                     </el-row>
                                     <div class="el-form-item-msg">营业时间为必选，否则小程序端无法下单</div>
@@ -103,32 +95,6 @@
                             <div class="el-form-item-msg">如果类型为金额比例，比例设置10，则表示抽取每单金额的10%为系统佣金，最多不超过100</div>
                         </el-form-item>
                     </fieldset>
-<<<<<<< HEAD
-=======
-                    <!-- <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.username" 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> -->
->>>>>>> 03cbf28cdc38d7763e084276112a40ebb2bc351f
                 </el-form>
             </el-main>
             <el-footer style="text-align: right;">

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

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

src/views/merchant/print/discount/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/print/index/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/print/price/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/shop/detail/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/shop/renew/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/shop/user/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/turnover/history/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/turnover/index/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/wallet/cash/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>

src/views/merchant/wallet/index/index.vue

@@ -0,0 +1,3 @@
+<template>
+
+</template>