liujd 6 лет назад
Родитель
Сommit
9c23538bed
33 измененных файлов с 447 добавлено и 197 удалено
  1. 6 6
      mobile-code/src/components/app-area-sel.vue
  2. 12 12
      mobile-code/src/components/app-delivery.vue
  3. 2 2
      mobile-code/src/components/app-swiper.vue
  4. 2 2
      mobile-code/src/components/module/app-activily-coupon.vue
  5. 78 30
      mobile-code/src/components/module/app-search.vue
  6. 12 0
      mobile-code/src/pages.json
  7. 45 0
      mobile-code/src/pages/ad/add.vue
  8. 22 10
      mobile-code/src/pages/ad/list.vue
  9. 19 0
      mobile-code/src/pages/ad/sel-goods.vue
  10. 2 6
      mobile-code/src/pages/admin/components/module/operate.vue
  11. 133 0
      mobile-code/src/pages/admin/components/sel-search.vue
  12. 4 4
      mobile-code/src/pages/admin/order.vue
  13. 5 16
      mobile-code/src/pages/chat/index.vue
  14. 2 2
      mobile-code/src/pages/coupon/list.vue
  15. 6 6
      mobile-code/src/pages/goods/components/sel-popup.vue
  16. 10 10
      mobile-code/src/pages/goods/detail.vue
  17. 6 6
      mobile-code/src/pages/home/components/login-popup.vue
  18. 2 2
      mobile-code/src/pages/home/index.vue
  19. 8 8
      mobile-code/src/pages/home/shop.vue
  20. 10 10
      mobile-code/src/pages/home/user.vue
  21. 9 13
      mobile-code/src/pages/interest/admin/invite.vue
  22. 4 4
      mobile-code/src/pages/interest/invite.vue
  23. 4 4
      mobile-code/src/pages/interest/level.vue
  24. 2 2
      mobile-code/src/pages/member/add.vue
  25. 6 6
      mobile-code/src/pages/member/detail.vue
  26. 4 4
      mobile-code/src/pages/order/admin/detail.vue
  27. 14 14
      mobile-code/src/pages/order/buy.vue
  28. 4 4
      mobile-code/src/pages/order/detail.vue
  29. 2 2
      mobile-code/src/pages/order/list.vue
  30. 2 2
      mobile-code/src/pages/pay/components/keyboard.vue
  31. 6 6
      mobile-code/src/pages/pay/index.vue
  32. 2 2
      mobile-code/src/pages/user/password.vue
  33. 2 2
      mobile-code/src/pages/user/register.vue

+ 6 - 6
mobile-code/src/components/app-area-sel.vue

@@ -37,15 +37,15 @@
 </template>
 
 <script>
-import bottomPopup from '@/components/plugin/bottom-popup'
-import appClose from '@/components/module/app-close'
-import appSearchModule from '@/components/module/app-search'
+import BottomPopup from '@/components/plugin/bottom-popup'
+import AppClose from '@/components/module/app-close'
+import AppSearchModule from '@/components/module/app-search'
 export default {
 	name: 'app-area-sel',
 	components: {
-		bottomPopup,
-		appClose,
-		appSearchModule
+		BottomPopup,
+		AppClose,
+		AppSearchModule
 	},
 	props: {
 		show: {

+ 12 - 12
mobile-code/src/components/app-delivery.vue

@@ -105,21 +105,21 @@
 </template>
 
 <script>
-import tuiListCell from '@/components/plugin/list-cell'
-import appDatePicker from '@/components/app-date-picker'
-import appTextarea from '@/components/app-textarea'
-import appListModule from '@/components/module/app-order-list'
-import appCouponSel from '@/components/app-coupon-sel'
-import appAreaSel from '@/components/app-area-sel'
+import TuiListCell from '@/components/plugin/list-cell'
+import AppDatePicker from '@/components/app-date-picker'
+import AppTextarea from '@/components/app-textarea'
+import AppListModule from '@/components/module/app-order-list'
+import AppCouponSel from '@/components/app-coupon-sel'
+import AppAreaSel from '@/components/app-area-sel'
 export default {
 	name: 'app-delivery-module',
 	components: {
-		tuiListCell,
-		appDatePicker,
-		appTextarea,
-		appListModule,
-		appCouponSel,
-		appAreaSel
+		TuiListCell,
+		AppDatePicker,
+		AppTextarea,
+		AppListModule,
+		AppCouponSel,
+		AppAreaSel
 	},
 	data() {
 		return {

+ 2 - 2
mobile-code/src/components/app-swiper.vue

@@ -10,11 +10,11 @@
 </template>
 
 <script>
-import appTag from '@/components/module/app-tag.vue'
+import AppTag from '@/components/module/app-tag.vue'
 export default {
 	name: 'app-swiper',
 	components: {
-		appTag
+		AppTag
 	},
 	props: {
 		list: {

+ 2 - 2
mobile-code/src/components/module/app-activily-coupon.vue

@@ -31,11 +31,11 @@
 </template>
 
 <script>
-import modalModule from '@/components/plugin/modal'
+import ModalModule from '@/components/plugin/modal'
 export default {
 	name: 'app-activily-coupon',
 	components: {
-		modalModule
+		ModalModule
 	},
 	props: {
 		show: {

+ 78 - 30
mobile-code/src/components/module/app-search.vue

@@ -1,22 +1,38 @@
 <template>
-	<div class="app-search-module" :style="{backgroundColor: backColor}">
-        <div class="icon-wrap" v-if="isIcon">
-            <i class="iconfont" :class="[icon]" ></i>
-        </div>
-        <div class="input-wrap">
-            <input type="text" :placeholder="placeholder" placeholder-class="placeholder">
-        </div>
-    </div>
+	<div class="app-search-module" :style="{height: height + 'rpx'}">
+		<div class="map-search" :style="{backgroundColor: backColor}">
+			<div class="icon-wrap" v-if="isIcon">
+				<i class="iconfont" :class="[icon]"></i>
+			</div>
+			<div class="input-wrap">
+				<input type="text" :style="{fontSize: fontSize + 'rpx'}" :placeholder="placeholder" placeholder-class="placeholder" />
+			</div>
+		</div>
+        <block v-if="isBtn">
+            <button v-if="isTextBtn" class="search-btn" :style="{fontSize: fontSize + 'rpx'}" @search="searchFn">{{ btnText }}</button>
+		    <button v-else class="search-btn admin-button-com middle blue" :style="{fontSize: fontSize + 'rpx'}" @search="searchFn">{{ btnText }}</button>
+        </block>
+	</div>
 </template>
 
 <script>
 export default {
 	name: 'app-search-module',
 	props: {
+		// 搜索组件的高度
+		height: {
+			type: Number,
+			default: 66
+		},
 		placeholder: {
 			type: String,
 			default: '请输入'
 		},
+		// size字体大小
+		fontSize: {
+			type: Number,
+			default: 26
+		},
 		// 是否有icon
 		isIcon: {
 			type: Boolean,
@@ -31,34 +47,66 @@ export default {
 		backColor: {
 			type: String,
 			default: '#F0F2F6'
+		},
+		// 是否需要按钮
+		isBtn: {
+			type: Boolean,
+			default: false
+		},
+		// 是否是文字按钮
+		isTextBtn: {
+			type: Boolean,
+			default: true
+		},
+		// 按钮文字
+		btnText: {
+			type: String,
+			default: '搜索'
+		}
+	},
+	methods: {
+		searchFn(e) {
+			this.$emit('search', e)
 		}
 	}
 }
 </script>
 
 <style lang="scss" scoped>
-.app-search-module {
-    @include disFlex(center, flex-start);
-    height: 66px;
-    width: 100%;
-    border-radius: 10px;
-    .icon-wrap {
-        margin-left: 20px;
-        width: 40px;
-        .iconfont {
-            color: #ccc;
+	.app-search-module {
+		width: 100%;
+		@include disFlex(center, space-between);
+		.map-search {
+			@include disFlex(center, flex-start);
+		    width: 100%;
+			height: 100%;
+			border-radius: 10px;
+			.icon-wrap {
+				margin-left: 20px;
+				width: 40px;
+				.iconfont {
+					color: #ccc;
+				}
+			}
+			.input-wrap {
+				width: calc(100% - 90px);
+				margin-left: 14px;
+				input {
+					font-size: 26px;
+					text-align: left;
+				}
+				.placeholder {
+					color: #ccc;
+				}
+			}
         }
-    }
-    .input-wrap {
-        width: calc(100% - 90px);
-        margin-left: 14px;
-        input {
-            font-size: 26px;
-            text-align: left;
+        // 按钮
+        .search-btn {
+            height: 100%;
+            padding: 0 20px;
+            flex-shrink: 0;
+            margin-left: 20px;
+            background-color: inherit;
         }
-        .placeholder {
-            color: #ccc;
-        }
-    }
-}
+	}
 </style>

+ 12 - 0
mobile-code/src/pages.json

@@ -97,6 +97,18 @@
 					"style": {
 						"navigationBarTitleText": "广告列表"
 					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加广告"
+					}
+				},
+				{
+					"path": "sel-goods",
+					"style": {
+						"navigationBarTitleText": "商品选择"
+					}
 				}
 			]
 		}

+ 45 - 0
mobile-code/src/pages/ad/add.vue

@@ -0,0 +1,45 @@
+<template>
+	<div class="app-content">
+        <!-- 广告信息 -->
+		<div class="module-com input-line-wrap">
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">收花人姓名</div>
+				<input v-model="form.receiveUserName" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请输入姓名" maxlength="50" type="number" />
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">电话</div>
+				<input v-model="form.receiveMobile" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="请输入电话" maxlength="50" type="number" />
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
+				<div class="tui-title">收花人地址</div>
+				<div class="tui-input">{{ form.receiveFullAddress }}</div>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">详细地址</div>
+				<input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="小区、大厦或街道名称,如金尚小区" maxlength="50" type="number" />
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">门牌号</div>
+				<input v-model="form.receiveFloor" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="楼号门牌号,如23号403室 (选填)" maxlength="50" type="number" />
+			</tui-list-cell>
+		</div>
+    </div>
+</template>
+
+<script>
+import TuiListCell from '@/components/plugin/list-cell'
+export default {
+	name: 'ad-add',
+	components: {
+		TuiListCell
+	},
+	data() {
+		return {
+			form: {}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

+ 22 - 10
mobile-code/src/pages/ad/list.vue

@@ -1,8 +1,8 @@
 <template>
 	<div class="app-content">
-		<!-- <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="50%" /> -->
+		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="50%" />
 		<div class="list-wrap">
-			<!-- <div class="list" v-for="(item, index) in 1" :key="index">
+			<div class="list" v-for="(item, index) in 1" :key="index">
 				<div class="list-img">
 					<img src="../../static/images/interest/invite.png" alt mode="center" />
 				</div>
@@ -22,10 +22,14 @@
 						</div>
 					</div>
 				</div>
-			</div> -->
+			</div>
 			<!-- 操作 -->
-			<operate-module :top="216" :right="30" :btnData="btnData" @del="operateDelFn" />
+			<operate-module v-show="operateShow" :top="216" :right="30" :btnData="btnData" />
 		</div>
+        <!-- 按钮 -->
+        <div class="app-footer">
+            <div class="admin-button-com middle blue">添加</div>
+        </div>
 	</div>
 </template>
 
@@ -49,15 +53,14 @@ export default {
 					name: '商城首页轮播图'
 				}
 			],
+			operateShow: false,
 			operateIndex: 0,
 			btnData: [
 				{
 					text: '编辑',
 					icon: 'iconshanchu1',
 					click: () => {
-			            console.log('9999999')
-			            console.log(this)
-						this.$emit('del')
+						this.operateDelFn()
 					}
 				}
 			]
@@ -76,11 +79,12 @@ export default {
 
 <style lang="scss" scoped>
 	.app-content {
-        min-height: calc(100vh - 100px);
+		min-height: calc(100vh - 200px);
         padding-top: 100px;
+        padding-bottom: 100px;
 	}
 	.list-wrap {
-        width: 100%;
+		width: 100%;
 		position: relative;
 		background-color: #fff;
 		.list {
@@ -108,5 +112,13 @@ export default {
 				}
 			}
 		}
-	}
+    }
+    // 按钮
+    .app-footer {
+        justify-content: flex-end;
+        .admin-button-com {
+            width: 160px;
+            margin-right: 30px;
+        }
+    }
 </style>

+ 19 - 0
mobile-code/src/pages/ad/sel-goods.vue

@@ -0,0 +1,19 @@
+<template>
+  <div class="app-content">
+      <sel-search-module></sel-search-module>
+  </div>
+</template>
+
+<script>
+import SelSearchModule from '@/pages/admin/components/sel-search'
+export default {
+	name: 'sel-goods',
+	components: {
+		SelSearchModule
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 2 - 6
mobile-code/src/pages/admin/components/module/operate.vue

@@ -5,7 +5,7 @@
 		</div>-->
 		<!-- 弹窗 -->
 		<!-- <div class="operate-wrap" :style="{top: top + 'rpx', right: right + 'rpx'}" > -->
-			<div class="operate-list" v-for="(item, index) in btnData" :key="index" @click="click(item.click)">
+			<div class="operate-list" v-for="(item, index) in btnData" :key="index" @click="item.click()">
 				<i class="iconfont" :class="[item.icon]"></i>
 				<div class="btn-text">{{ item.text }}</div>
                 <!-- <span>{{item.click}}</span> -->
@@ -35,11 +35,7 @@ export default {
 			default: () => []
 		}
 	},
-	methods: {
-		click(fn) {
-			fn()
-		}
-	}
+	methods: {}
 }
 </script>
 

+ 133 - 0
mobile-code/src/pages/admin/components/sel-search.vue

@@ -0,0 +1,133 @@
+<template>
+	<div class="sel-search-module">
+		<div class="input-wrap">
+			<app-search-module placeholder="请输入商品名称" :isBtn="true" />
+		</div>
+        <!-- 列表 -->
+		<div class="list-wrap">
+			<!-- 单选 -->
+			<block v-if="true">
+				<radio-group @change="radioChange">
+					<label class="list" v-for="(item, index) in selData" :key="item.value">
+						<div class="checkbox-wrap">
+							<radio :value="item.value" :checked="item.checked" />
+						</div>
+                        <!-- 图片块 -->
+                        <slot name="img">
+                            <div class="list-img">
+				                <app-avatar-module :width="120" />
+                            </div>
+                        </slot>
+                        <!-- 列表详情块 -->
+                        <slot name="detail">
+                            <div class="list-right">
+                                <div class="list-name">冯宝宝</div>
+                                <div>手机号: 153928272626</div>
+                                <div>会员等级: 普通会员</div>
+                                <div>最后访问: 2019-12-09  10:10</div>
+                            </div>
+                        </slot>
+					</label>
+				</radio-group>
+			</block>
+			<!-- 多选 -->
+			<block v-else>
+				<checkbox-group @change="checkboxChange">
+					<div class="list" v-for="(item, index) in selData" :key="index">
+						<div class="checkbox-wrap">
+							<checkbox class="ljd-checkbox" :value="item.value" :checked="item.checked" />
+						</div>
+					</div>
+				</checkbox-group>
+			</block>
+		</div>
+        <!-- 按钮 -->
+        <div class="app-footer">
+            <div class="admin-button-com middle blue">确认</div>
+        </div>
+	</div>
+</template>
+
+<script>
+import AppSearchModule from '@/components/module/app-search'
+import AppAvatarModule from '@/components/module/app-avatar'
+export default {
+	name: 'sel-search-module',
+	components: {
+		AppSearchModule,
+		AppAvatarModule
+	},
+	data() {
+		return {
+			selData: [
+				{
+					value: 'USA'
+				},
+				{
+					value: 'CHN',
+					checked: true
+				},
+				{
+					value: 'BRA'
+				},
+				{
+					value: 'JPN'
+				}
+			]
+		}
+	},
+	methods: {
+		radioChange(e) {
+			// console.log(e)
+			// this.selData = []
+		},
+		checkboxChange() {}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.sel-search-module {
+		padding-top: 130px;
+		padding-bottom: 120px;
+	}
+	.input-wrap {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: calc(100% - 50px);
+		background-color: #fff;
+		padding: 22px 20px 22px 30px;
+    }
+    // 列表
+	.list-wrap {
+        width: 100%;
+        background-color: #fff;
+        .list {
+            width: calc(100% - 60px);
+            margin: 0 30px;
+            padding: 10px 0 20px;
+            @include disFlex(center, flex-start);
+            border-bottom: 2px solid $borderColor;
+            .list-img {
+                margin: 0 20px;
+            }
+            .list-right {
+                color: $fontColor3;
+                .list-name {
+                    color: #333;
+                    font-size: 30px;
+                    margin-bottom: 10px;
+                }
+            }
+        }
+	}
+    // 按钮
+    .app-footer {
+        justify-content: flex-end;
+        .admin-button-com {
+            width: 160px;
+            margin-right: 30px;
+        }
+    }
+</style>

+ 4 - 4
mobile-code/src/pages/admin/order.vue

@@ -24,13 +24,13 @@
 </template>
 
 <script>
-import appTabs from '@/components/plugin/tabs'
-import listModule from '@/components/module/app-order-list'
+import AppTabs from '@/components/plugin/tabs'
+import ListModule from '@/components/module/app-order-list'
 export default {
 	name: 'order-list',
 	components: {
-		listModule,
-		appTabs
+		ListModule,
+		AppTabs
 	},
 	data() {
 		return {

+ 5 - 16
mobile-code/src/pages/chat/index.vue

@@ -34,10 +34,7 @@
 				<div class="tool-list">发照片</div>
 			</div>
 			<div class="input-wrap">
-				<div class="map-search">
-					<app-search-module placeholder="输入消息..." :isIcon="false" backColor="#fff" />
-				</div>
-				<button class="button-com red">发送</button>
+				<app-search-module placeholder="输入消息..." :isIcon="false" backColor="#fff" :height="70" />
 			</div>
 		</div>
 		<!-- 发链接弹窗 -->
@@ -55,13 +52,13 @@
 </template>
 
 <script>
-import appSearchModule from '@/components/module/app-search'
-import modalModule from '@/components/plugin/modal'
+import AppSearchModule from '@/components/module/app-search'
+import ModalModule from '@/components/plugin/modal'
 export default {
 	name: 'chat-index',
 	components: {
-		appSearchModule,
-		modalModule
+		AppSearchModule,
+		ModalModule
 	},
 	data() {
 		return {
@@ -197,14 +194,6 @@ export default {
 		}
 		// 输入框
 		.input-wrap {
-			@include disFlex(center, space-between);
-			.map-search {
-				width: 74%;
-			}
-			.button-com {
-				width: 24%;
-				border-radius: 10px;
-			}
 			/deep/.app-search-module {
 				height: 70px;
 				input {

+ 2 - 2
mobile-code/src/pages/coupon/list.vue

@@ -53,12 +53,12 @@
 </template>
 
 <script>
-import appTabs from '@/components/plugin/tabs'
+import AppTabs from '@/components/plugin/tabs'
 import { list } from '@/api/coupon'
 export default {
 	name: 'tabs',
 	components: {
-		appTabs
+		AppTabs
 	},
 	data() {
 		return {

+ 6 - 6
mobile-code/src/pages/goods/components/sel-popup.vue

@@ -32,15 +32,15 @@
 </template>
 
 <script>
-import bottomPopup from '@/components/plugin/bottom-popup'
-import numberBox from '@/components/plugin/number-box'
-import appClose from '@/components/module/app-close'
+import BottomPopup from '@/components/plugin/bottom-popup'
+import NumberBox from '@/components/plugin/number-box'
+import AppClose from '@/components/module/app-close'
 export default {
 	name: 'sel-popup',
 	components: {
-		bottomPopup,
-		numberBox,
-		appClose
+		BottomPopup,
+		NumberBox,
+		AppClose
 	},
 	props: {
 		// 信息

+ 10 - 10
mobile-code/src/pages/goods/detail.vue

@@ -56,20 +56,20 @@
 </template>
 
 <script>
-import appSwiper from '@/components/app-swiper'
-import appTag from '@/components/module/app-tag.vue'
-import appTrademark from '@/components/module/app-trademark'
-import buyFoot from './components/buy-foot.vue'
-import selPopup from './components/sel-popup.vue'
+import AppSwiper from '@/components/app-swiper'
+import AppTag from '@/components/module/app-tag.vue'
+import AppTrademark from '@/components/module/app-trademark'
+import BuyFoot from './components/buy-foot.vue'
+import SelPopup from './components/sel-popup.vue'
 import { getDetail } from '@/api/goods'
 export default {
 	name: 'goods-detail',
 	components: {
-		appSwiper,
-		appTag,
-		appTrademark,
-		buyFoot,
-		selPopup
+		AppSwiper,
+		AppTag,
+		AppTrademark,
+		BuyFoot,
+		SelPopup
 	},
 	data() {
 		return {

+ 6 - 6
mobile-code/src/pages/home/components/login-popup.vue

@@ -49,15 +49,15 @@
 </template>
 
 <script>
-import appStep from '@/components/app-step'
-import bottomPopup from '@/components/plugin/bottom-popup'
-import appClose from '@/components/module/app-close'
+import AppStep from '@/components/app-step'
+import BottomPopup from '@/components/plugin/bottom-popup'
+import AppClose from '@/components/module/app-close'
 export default {
 	name: 'login-popup-module',
 	components: {
-		appStep,
-		bottomPopup,
-		appClose
+		AppStep,
+		BottomPopup,
+		AppClose
 	},
 	props: {
 		stepIndex: {

+ 2 - 2
mobile-code/src/pages/home/index.vue

@@ -9,11 +9,11 @@
 </template>
 
 <script>
-// import appFooter from '@/components/app-footer'
+// import AppFooter from '@/components/app-footer'
 export default {
 	name: 'home',
 	components: {
-		// appFooter
+		// AppFooter
 	},
 	data() {
 		return {}

+ 8 - 8
mobile-code/src/pages/home/shop.vue

@@ -39,19 +39,19 @@
 </template>
 
 <script>
-// import appFooter from '@/components/app-footer'
-import tuiListView from '@/components/plugin/list-view'
-import tuiListCell from '@/components/plugin/list-cell'
+// import AppFooter from '@/components/app-footer'
+import TuiListView from '@/components/plugin/list-view'
+import TuiListCell from '@/components/plugin/list-cell'
 import AppSwiper from '@/components/app-swiper'
-import appActivilyCoupon from '@/components/module/app-activily-coupon'
+import AppActivilyCoupon from '@/components/module/app-activily-coupon'
 export default {
 	name: 'category',
 	components: {
-		// appFooter,
+		// AppFooter,
 		AppSwiper,
-		tuiListView,
-		tuiListCell,
-		appActivilyCoupon
+		TuiListView,
+		TuiListCell,
+		AppActivilyCoupon
 	},
 	data() {
 		return {}

+ 10 - 10
mobile-code/src/pages/home/user.vue

@@ -93,19 +93,19 @@
 </template>
 
 <script>
-// import appFooter from '@/components/app-footer'
-import tuiListView from '@/components/plugin/list-view'
-import tuiListCell from '@/components/plugin/list-cell'
-import loginPopup from '@/pages/home/components/login-popup'
-import appTrademark from '@/components/module/app-trademark'
+// import AppFooter from '@/components/app-footer'
+import TuiListView from '@/components/plugin/list-view'
+import TuiListCell from '@/components/plugin/list-cell'
+import LoginPopup from '@/pages/home/components/login-popup'
+import AppTrademark from '@/components/module/app-trademark'
 export default {
 	name: 'user',
 	components: {
-		// appFooter
-		tuiListView,
-		tuiListCell,
-		loginPopup,
-		appTrademark
+		// AppFooter
+		TuiListView,
+		TuiListCell,
+		LoginPopup,
+		AppTrademark
 	},
 	data() {
 		return {

+ 9 - 13
mobile-code/src/pages/interest/admin/invite.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="app-content">
-		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" addIcon="iconshezhi" addText="设置" @add="$util.pageTo('/pages/interest/admin/setting')" :isBoxShadow="false" :currentTab="tabIndex" @change="change" itemWidth="25%" />
+		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" addIcon="iconshezhi" addText="设置" @add="$util.pageTo('/pages/interest/admin/setting')" :isBoxShadow="false" :currentTab="tabIndex" @change="change" itemWidth="25%" :padding="0" />
 		<div class="input-wrap">
-			<div class="map-search">
-				<app-search-module placeholder="请输入商品名称" />
-			</div>
-			<div class="app-size-26">搜索</div>
+			<!-- <div class="map-search"> -->
+				<app-search-module placeholder="请输入商品名称" :isBtn="true"  />
+			<!-- </div> -->
+			<!-- <div class="app-size-26">搜索</div> -->
 		</div>
 		<!-- list -->
 		<div class="list-wrap">
@@ -69,14 +69,14 @@
 import AppTabs from '@/components/plugin/tabs'
 import AppSearchModule from '@/components/module/app-search'
 import AppAvatarModule from '@/components/module/app-avatar'
-import modalModule from '@/components/plugin/modal'
+import ModalModule from '@/components/plugin/modal'
 export default {
 	name: 'admin-invite',
 	components: {
 		AppTabs,
 		AppSearchModule,
 		AppAvatarModule,
-		modalModule
+		ModalModule
 	},
 	data() {
 		return {
@@ -122,14 +122,10 @@ export default {
 		position: fixed;
 		top: 80px;
 		left: 0;
-		width: calc(100% - 60px);
-		@include disFlex(center, space-between);
+		width: calc(100% - 50px);
 		background-color: #fff;
-        padding: 22px 30px;
+        padding: 22px 20px 22px 30px;
         border-top: 1px solid $borderColor;
-		.map-search {
-			width: 88%;
-		}
     }
     // list
     .list-wrap {

+ 4 - 4
mobile-code/src/pages/interest/invite.vue

@@ -82,13 +82,13 @@
 </template>
 
 <script>
-import alertModule from '@/components/plugin/alert'
-import appShareMask from '@/components/module/app-share-mask'
+import AlertModule from '@/components/plugin/alert'
+import AppShareMask from '@/components/module/app-share-mask'
 export default {
 	name: 'invite',
 	components: {
-		alertModule,
-		appShareMask
+		AlertModule,
+		AppShareMask
 	},
 	data() {
 		return {

+ 4 - 4
mobile-code/src/pages/interest/level.vue

@@ -43,13 +43,13 @@
 </template>
 
 <script>
-import appVipModule from '@/components/module/app-vip'
-import appTrademarkModule from '@/components/module/app-trademark'
+import AppVipModule from '@/components/module/app-vip'
+import AppTrademarkModule from '@/components/module/app-trademark'
 export default {
 	name: 'interest-rank',
 	components: {
-		appVipModule,
-		appTrademarkModule
+		AppVipModule,
+		AppTrademarkModule
 	}
 }
 </script>

+ 2 - 2
mobile-code/src/pages/member/add.vue

@@ -35,13 +35,13 @@
 </template>
 
 <script>
-import tuiListCell from '@/components/plugin/list-cell'
+import TuiListCell from '@/components/plugin/list-cell'
 // api
 import { add } from '@/api/member'
 export default {
 	name: 'member-add',
 	components: {
-		tuiListCell
+		TuiListCell
 	},
 	data() {
 		return {

+ 6 - 6
mobile-code/src/pages/member/detail.vue

@@ -102,9 +102,9 @@
 </template>
 
 <script>
-import appVipModule from '@/components/module/app-vip'
-import appAvatarModule from '@/components/module/app-avatar'
-import modalModule from '@/components/plugin/modal'
+import AppVipModule from '@/components/module/app-vip'
+import AppAvatarModule from '@/components/module/app-avatar'
+import ModalModule from '@/components/plugin/modal'
 // img
 import tabIcon1 from '@/static/images/member/tab-icon-1.png'
 import tabIcon2 from '@/static/images/member/tab-icon-2.png'
@@ -117,9 +117,9 @@ import tabIcon8 from '@/static/images/member/tab-icon-8.png'
 export default {
 	name: 'member-detail',
 	components: {
-		appVipModule,
-		appAvatarModule,
-		modalModule
+		AppVipModule,
+		AppAvatarModule,
+		ModalModule
 	},
 	props: {},
 	data() {

+ 4 - 4
mobile-code/src/pages/order/admin/detail.vue

@@ -133,13 +133,13 @@
 </template>
 
 <script>
-import listModule from '@/components/module/app-order-list'
-import appCoupon from '@/components/app-coupon-sel'
+import ListModule from '@/components/module/app-order-list'
+import AppCoupon from '@/components/app-coupon-sel'
 export default {
 	name: 'order-detail',
 	components: {
-		listModule,
-		appCoupon
+		ListModule,
+		AppCoupon
 	}
 }
 </script>

+ 14 - 14
mobile-code/src/pages/order/buy.vue

@@ -68,23 +68,23 @@
 </template>
 
 <script>
-import appTabs from '@/components/plugin/tabs'
-import tuiListCell from '@/components/plugin/list-cell'
-import appDeliveryModule from '@/components/app-delivery'
-import appTrademark from '@/components/module/app-trademark'
-import appListModule from '@/components/module/app-order-list'
-import appCouponSel from '@/components/app-coupon-sel'
-import alertModule from '@/components/plugin/alert'
+import AppTabs from '@/components/plugin/tabs'
+import TuiListCell from '@/components/plugin/list-cell'
+import AppDeliveryModule from '@/components/app-delivery'
+import AppTrademark from '@/components/module/app-trademark'
+import AppListModule from '@/components/module/app-order-list'
+import AppCouponSel from '@/components/app-coupon-sel'
+import AlertModule from '@/components/plugin/alert'
 export default {
 	name: 'order-buy',
 	components: {
-		appTabs,
-		appDeliveryModule,
-		tuiListCell,
-		appListModule,
-		appCouponSel,
-		appTrademark,
-		alertModule
+		AppTabs,
+		AppDeliveryModule,
+		TuiListCell,
+		AppListModule,
+		AppCouponSel,
+		AppTrademark,
+		AlertModule
 	},
 	data() {
 		return {

+ 4 - 4
mobile-code/src/pages/order/detail.vue

@@ -107,13 +107,13 @@
 </template>
 
 <script>
-import listModule from '@/components/module/app-order-list'
-import appCoupon from '@/components/app-coupon-sel'
+import ListModule from '@/components/module/app-order-list'
+import AppCoupon from '@/components/app-coupon-sel'
 export default {
 	name: 'order-detail',
 	components: {
-		listModule,
-		appCoupon
+		ListModule,
+		AppCoupon
 	}
 }
 </script>

+ 2 - 2
mobile-code/src/pages/order/list.vue

@@ -20,11 +20,11 @@
 </template>
 
 <script>
-import listModule from '@/components/module/app-order-list'
+import ListModule from '@/components/module/app-order-list'
 export default {
 	name: 'order-list',
 	components: {
-		listModule
+		ListModule
 	},
 	data() {
 		return {}

+ 2 - 2
mobile-code/src/pages/pay/components/keyboard.vue

@@ -17,11 +17,11 @@
 </template>
 
 <script>
-import bottomPopup from '@/components/plugin/bottom-popup'
+import BottomPopup from '@/components/plugin/bottom-popup'
 export default {
 	name: 'keyboard',
 	components: {
-		bottomPopup
+		BottomPopup
 	},
 	props: {
 		show: {

+ 6 - 6
mobile-code/src/pages/pay/index.vue

@@ -33,9 +33,9 @@
 </template>
 
 <script>
-import appTabs from '@/components/plugin/tabs'
-import payInputModule from './components/pay-input'
-import appDeliveryModule from '@/components/app-delivery'
+import AppTabs from '@/components/plugin/tabs'
+import PayInputModule from './components/pay-input'
+import AppDeliveryModule from '@/components/app-delivery'
 import { getMiniAppUrl } from '@/utils/common'
 import { getCheckLogin } from '@/utils/auth'
 import wexinPay from '@/utils/pay/wxPay'
@@ -44,9 +44,9 @@ import { oauth } from '@/api/login'
 export default {
 	name: 'pay',
 	components: {
-		appTabs,
-		payInputModule,
-		appDeliveryModule
+		AppTabs,
+		PayInputModule,
+		AppDeliveryModule
 	},
 	data() {
 		return {

+ 2 - 2
mobile-code/src/pages/user/password.vue

@@ -22,11 +22,11 @@
 </template>
 
 <script>
-import tuiListCell from '@/components/plugin/list-cell'
+import TuiListCell from '@/components/plugin/list-cell'
 export default {
 	name: 'password',
 	components: {
-		tuiListCell
+		TuiListCell
 	},
 	data() {
 		return {}

+ 2 - 2
mobile-code/src/pages/user/register.vue

@@ -26,11 +26,11 @@
 </template>
 
 <script>
-import tuiListCell from '@/components/plugin/list-cell'
+import TuiListCell from '@/components/plugin/list-cell'
 export default {
 	name: 'register',
 	components: {
-		tuiListCell
+		TuiListCell
 	},
 	data() {
 		return {