liujd 6 лет назад
Родитель
Сommit
697946860c

+ 17 - 0
mobile-code/src/change.bat

@@ -7,6 +7,7 @@ set business=b-
 set manifest=manifest.json
 set pages=pages.json
 set config=config.js
+set uni=uni.scss
 set /a sum=0
 
 for %%m in (*) do (
@@ -34,6 +35,10 @@ if "%isMobile%"=="mobile" (
 			ren %%z %business%%%z
 			set /a sum+=1
 		)
+		if "%%z"=="uni.scss" (
+			ren %%z %business%%%z
+			set /a sum+=1
+		)
 	)
 	echo,
 	for %%z in (*) do (
@@ -50,6 +55,10 @@ if "%isMobile%"=="mobile" (
 			ren %%z %config%
 			set /a sum+=1
 		)
+		if "%%z"=="m-uni.scss" (
+			ren %%z %uni%
+			set /a sum+=1
+		)
 	)
 ) else (
 	echo %isMobile%
@@ -67,6 +76,10 @@ if "%isMobile%"=="mobile" (
 			ren %%z %mobile%%%z
 			set /a sum+=1
 		)
+		if "%%z"=="uni.scss" (
+			ren %%z %mobile%%%z
+			set /a sum+=1
+		)
 	)
 	echo,
 	for %%z in (*) do (
@@ -83,6 +96,10 @@ if "%isMobile%"=="mobile" (
 			ren %%z %config%
 			set /a sum+=1
 		)
+		if "%%z"=="b-uni.scss" (
+			ren %%z %uni%
+			set /a sum+=1
+		)
 	)
 )
 echo,

+ 1 - 0
mobile-code/src/components/plugin/fab.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 全局公共悬浮按钮 -->
 	<view @touchmove.stop.prevent>
 		<view class="tui-fab-box" :class="{'tui-fab-right':!left || (left && right)}" :style="{left:getLeft(),right:getRight(),bottom:bottom+'rpx'}">
 			<view class="tui-fab-btn" :class="{'tui-visible':isOpen,'tui-fab-hidden':hidden}">

+ 9 - 2
mobile-code/src/components/plugin/tabs.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="tui-tabs-view" :class="[isFixed?'tui-tabs-fixed':'tui-tabs-relative',unlined?'tui-unlined':'']" :style="{height:height+'rpx',padding:`0 ${padding}rpx`,background:bgColor,top:isFixed?top+'px':'auto'}">
+	<view class="tui-tabs-view" :class="[isFixed?'tui-tabs-fixed':'tui-tabs-relative',unlined?'tui-unlined':'', isBoxShadow? 'tui-tabs-view-shadow': '']" :style="{height:height+'rpx',padding:`0 ${padding}rpx`,background:bgColor,top:isFixed?top+'px':'auto'}">
 		<div class="item-wrap" :style="{width: isAdd ? `calc(100% - ${addTabWidth + 30}rpx)` : '100%'}">
 			<view v-for="(item,index) in tabs" :key="index" class="tui-tabs-item" :class="{'border-left': borderLeft}" :style="{width:itemWidth}" @tap.stop="swichTabs(index)">
 				<view class="tui-tabs-title" :class="{'tui-tabs-active':currentTab==index,'tui-tabs-disabled':item.disabled}" :style="{fontSize:size+'rpx',lineHeight:size+'rpx',fontWeight:bold && currentTab==index?'bold':'normal'}">
@@ -118,6 +118,11 @@ export default {
 		isAdd: {
 			type: Boolean,
 			default: false
+		},
+		// 是否显示box-shadow
+		isBoxShadow: {
+			type: Boolean,
+			default: true
 		}
 	},
 	watch: {
@@ -200,7 +205,6 @@ export default {
 		align-items: center;
 		justify-content: space-between;
 		z-index: 99;
-		box-shadow: 4px 4px 10px #eee;
 		.tui-tabs-item {
 			&.border-left {
 				border-left: 2px solid #ddd;
@@ -212,6 +216,9 @@ export default {
 			}
 		}
 	}
+	.tui-tabs-view-shadow {
+		box-shadow: 4px 4px 10px #eee;
+	}
 
 	.tui-tabs-relative {
 		position: relative;

+ 0 - 0
mobile-code/src/uni-b.scss → mobile-code/src/m-uni.scss


+ 23 - 1
mobile-code/src/pages.json

@@ -37,7 +37,7 @@
 			"root": "pages/order",
 			"pages": [
 				{
-					"path": "manage/detail",
+					"path": "admin/detail",
 					"style": {
 						"navigationBarTitleText": "详情"
 					}
@@ -60,6 +60,28 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pages/interest",
+			"pages": [
+				{
+					"path": "admin/invite",
+					"style": {
+						"navigationBarTitleText": "邀请列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/coupon",
+			"pages": [
+				{
+					"path": "admin/list",
+					"style": {
+						"navigationBarTitleText": "优惠券"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {

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

@@ -1,7 +1,7 @@
 <template>
 	<div class="app-main app-content">
 		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" :height="100" @change="change" itemWidth="20%" />
-		<div class="list-wrap" v-for="(item, index) in 4" :key="index" @click="$util.pageTo('/pages/order/manage/detail')">
+		<div class="list-wrap" v-for="(item, index) in 4" :key="index" @click="$util.pageTo('/pages/order/admin/detail')">
 			<div class="list-top flex-center-between">
 				<div class="app-color-3">订单编号:3261515151</div>
 				<div class="app-price">等待支付</div>

+ 38 - 16
mobile-code/src/pages/admin/workbench.vue

@@ -3,7 +3,7 @@
 		<!-- 用户信息 -->
 		<div class="user-wrap">
 			<div class="user-top">
-				<div>今日概况</div>
+				<div class="app-size-28">今日概况</div>
 				<app-avatar-module :width="80" />
 			</div>
 			<div class="income-amount">
@@ -26,16 +26,16 @@
 			</div>
 		</div>
 		<!-- 订单总览 -->
-		<!-- <div class="module-com order-wrap">
+		<div class="module-com order-wrap">
 			<div class="total-blo">
 				<div class="total-list" v-for="(item, index) in orderData" :key="index">
 					<div class="list-num">{{ item.value }}</div>
 					<div class="app-color-3">{{ item.name }}</div>
 				</div>
 			</div>
-		</div> -->
+		</div>
 		<!-- 消息 -->
-		<!-- <div class="module-com news-wrap">
+		<div class="module-com news-wrap">
 			<div class="news-list" v-for="(item, index) in 3" :key="index">
 				<div class="news-left">
 					<i class="iconfont iconxiaoxi2"></i>
@@ -46,18 +46,18 @@
 					<i class="iconfont iconxiangyou"></i>
 				</div>
 			</div>
-		</div> -->
+		</div>
 		<!-- 客户按钮 -->
-		<!-- <div class="module-com tabs-wrap">
+		<div class="module-com tabs-wrap">
 			<div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="$util.pageTo(item)">
 				<div class="tabs-img">
 					<img :src="item.img" alt mode="widthFix" />
 				</div>
 				<div class="tabs-name">{{ item.name }}</div>
 			</div>
-		</div> -->
+		</div>
 		<!-- 总览 -->
-		<!-- <div class="module-com total-wrap">
+		<div class="module-com total-wrap">
 			<div class="total-tit">总览</div>
 			<div class="total-blo">
 				<div class="total-list" v-for="(item, index) in totalData" :key="index">
@@ -65,14 +65,14 @@
 					<div class="app-color-3">{{ item.name }}</div>
 				</div>
 			</div>
-		</div> -->
+		</div>
 		<fab-module />
 	</div>
 </template>
 
 <script>
 import FabModule from '@/components/plugin/fab'
-import appAvatarModule from '@/components/module/app-avatar'
+import AppAvatarModule from '@/components/module/app-avatar'
 // img
 import tabIcon1 from '@/static/images/admin/tab-icon-1.png'
 import tabIcon2 from '@/static/images/admin/tab-icon-2.png'
@@ -86,7 +86,7 @@ export default {
 	name: 'admin-workbench',
 	components: {
 		FabModule,
-		appAvatarModule
+		AppAvatarModule
 	},
 	data() {
 		return {
@@ -127,12 +127,12 @@ export default {
 				{
 					name: '邀请有礼',
 					img: tabIcon2,
-					url: '/pages/coupon/list'
+					url: '/pages/interest/admin/invite'
 				},
 				{
 					name: '优惠券',
 					img: tabIcon3,
-					url: '/pages/coupon/list'
+					url: '/pages/coupon/admin/list'
 				},
 				{
 					name: '广告管理',
@@ -203,6 +203,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+	.app-content {
+		padding-bottom: 10px;
+	}
 	// 公共
 	.module-com {
 		margin-bottom: 20px;
@@ -214,15 +217,34 @@ export default {
 	// 用户信息
 	.user-wrap {
 		padding: 20px 40px 40px 30px;
+		color: #fff;
+		text-align: center;
+		background-image: url('../../static/images/admin/bg.png');
+		background-size: 100% 380px;
+		background-repeat: no-repeat;
 		.user-top {
+			// padding-top: 20px;
 			@include disFlex(center, space-between);
 		}
 		.income-amount {
-			margin-top: 20px;
-			margin-bottom: 60px;
+			margin-top: 14px;
+			margin-bottom: 40px;
 			.price {
 				font-size: 50px;
-				color: #fff;
+				font-weight: bold;
+				margin-top: 4px;
+			}
+		}
+		.user-bottom {
+			@include disFlex(center, space-around);
+			// padding-bottom: 40px;
+			.info-list-name {
+				color: #BFD4FF;
+			}
+			.info-list-value {
+				font-size: 36px;
+				font-weight: bold;
+				margin-top: 4px;
 			}
 		}
 	}

+ 102 - 0
mobile-code/src/pages/coupon/admin/list.vue

@@ -0,0 +1,102 @@
+<template>
+	<div class="app-content">
+		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" :height="100" itemWidth="25%" />
+		<!-- list -->
+		<div class="list-wrap">
+			<div class="list" v-for="(item, index) in 10" :key="index">
+				<div>
+					<app-avatar-module :width="110" />
+				</div>
+				<div class="list-right">
+					<div class="app-size-30 app-color-0">清明哈</div>
+                    <div class="list-info">
+                        <div>
+                            <div>
+                                <span class="list-info-left">ID: 0927</span>
+                                <span>手机号: 13285979347</span>
+                            </div>
+                            <div class="list-remark">
+                                <span class="list-info-left">金额: 80</span>
+                                <span>最底消费: 600</span>
+                            </div>
+                        </div>
+                        <div>待下单</div>
+                    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import AppTabs from '@/components/plugin/tabs'
+import AppAvatarModule from '@/components/module/app-avatar'
+export default {
+	name: 'admin-invite',
+	components: {
+		AppTabs,
+		AppAvatarModule
+	},
+	data() {
+		return {
+			tabIndex: 0,
+			tabs: [
+				{
+					name: '全部',
+					value: 52
+				},
+				{
+					name: '待使用',
+					value: 30
+				},
+				{
+					name: '已使用',
+					value: 10
+				},
+				{
+					name: '已失效',
+					value: 5
+				}
+			]
+		}
+	},
+	methods: {
+		change(e) {
+			this.tabIndex = e.index
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.app-content {
+		padding-top: 120px;
+	}
+    // list
+    .list-wrap {
+        width: 100%;
+        color: $fontColor3;
+        background-color: #fff;
+        .list {
+            @include disFlex(center, space-between);
+            width: calc(100% - 60px);
+            padding: 30px 0;
+            margin: 0 30px;
+            border-bottom: 1px solid $borderColor;
+            .list-right {
+                width: calc(100% - 130px);
+                .list-info {
+                    @include disFlex(center, space-between);
+                    margin-top: 10px;
+                    .list-remark {
+                        margin-top: 10px;
+                    }
+                    .list-info-left {
+                        display: inline-block;
+                        width: 160px;
+                    }
+                }
+            }
+        }
+    }
+</style>

+ 131 - 0
mobile-code/src/pages/interest/admin/invite.vue

@@ -0,0 +1,131 @@
+<template>
+	<div class="app-content">
+		<app-tabs :tabs="tabs" :isFixed="true" :isBoxShadow="false" :currentTab="tabIndex" @change="change" itemWidth="25%" />
+		<div class="input-wrap">
+			<div class="map-search">
+				<app-search-module placeholder="请输入商品名称" />
+			</div>
+			<div class="app-size-26">搜索</div>
+		</div>
+		<!-- list -->
+		<div class="list-wrap">
+			<div class="list" v-for="(item, index) in 10" :key="index">
+				<div>
+					<app-avatar-module :width="110" />
+				</div>
+				<div class="list-right">
+					<div class="flex-center-between">
+						<div class="app-size-30 app-color-0">清明哈</div>
+                        <div>待下单</div>
+					</div>
+                    <div class="list-info">
+                        <div class="list-info-left">
+                            <div>介绍人:曾小小</div>
+                            <div class="list-remark">2019-11-9 16:15   领券</div>
+                        </div>
+                        <div class="admin-button-com blue">兑奖</div>
+                    </div>
+				</div>
+			</div>
+		</div>
+		<!-- 兑奖弹窗 -->
+		<modal-module :show="redeemModal" :custom="true" @cancel="modalCancel" @click="modalClick" padding="30rpx 30rpx">
+			<template>
+                <div class="redeem-wrap">
+                    div.
+                </div>
+			</template>
+		</modal-module>
+	</div>
+</template>
+
+<script>
+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'
+export default {
+	name: 'admin-invite',
+	components: {
+		AppTabs,
+		AppSearchModule,
+		AppAvatarModule,
+		modalModule
+	},
+	data() {
+		return {
+			tabIndex: 0,
+			tabs: [
+				{
+					name: '全部'
+				},
+				{
+					name: '待下单'
+				},
+				{
+					name: '待兑奖'
+				},
+				{
+					name: '已兑奖'
+				}
+			],
+			redeemModal: true
+		}
+	},
+	methods: {
+		change(e) {
+			this.tabIndex = e.index
+		},
+		modalCancel() {
+			this.redeemModal = false
+		},
+		modalClick() {}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.app-content {
+		padding-top: 210px;
+	}
+	// 搜索框
+	.input-wrap {
+		position: fixed;
+		top: 80px;
+		left: 0;
+		width: calc(100% - 60px);
+		@include disFlex(center, space-between);
+		background-color: #fff;
+        padding: 22px 30px;
+        border-top: 1px solid $borderColor;
+		.map-search {
+			width: 88%;
+		}
+    }
+    // list
+    .list-wrap {
+        width: 100%;
+        color: $fontColor3;
+        background-color: #fff;
+        .list {
+            @include disFlex(center, space-between);
+            width: calc(100% - 60px);
+            padding: 30px 0;
+            margin: 0 30px;
+            border-bottom: 1px solid $borderColor;
+            .list-right {
+                width: calc(100% - 130px);
+                .list-info {
+                    @include disFlex(center, space-between);
+                    margin-top: 10px;
+                    .list-remark {
+                        margin-top: 10px;
+                    }
+                    .admin-button-com {
+                        width: 80px;
+                    }
+                }
+            }
+        }
+    }
+</style>

+ 0 - 0
mobile-code/src/pages/order/manage/detail.vue → mobile-code/src/pages/order/admin/detail.vue


+ 0 - 0
mobile-code/src/pages/order/manage/ship.vue → mobile-code/src/pages/order/admin/ship.vue


+ 4 - 0
mobile-code/src/static/css/base.scss

@@ -105,6 +105,10 @@
 	padding: 0 30px;
 }
 
+.app-color-0 {
+    color: #333;
+}
+
 .app-color-1 {
     color: $fontColorMain;
 }

BIN
mobile-code/src/static/images/interest/introducer.png


BIN
mobile-code/src/static/images/interest/new-member.png