开单

ghs/src/mock/userInfo.js

@@ -165,8 +165,8 @@ let menu = {
 		{id: '904',	parentId: '9',name: '操作记录',type: 1,icon: 'iconkehuguanli',orderNum: 9,router: '/operate/list',viewPath: 'views/staff/operate.vue',keepAlive: 1},
 		{id: '10',parentId: null,name: '门店',type: 1,icon: 'iconguanggao',orderNum: 10,router: '/shop/list',viewPath: 'views/shop/list.vue',keepAlive: 1},
         {id: '1001',parentId: 10,name: '门店列表',type: 1,icon: 'iconguanggao',orderNum: 10,router: '/shop/list',viewPath: 'views/shop/list.vue',keepAlive: 1},
-		{id: '11',parentId: null,name: '赚钱',type: 1,icon: 'iconyaoqingyouli',orderNum: 11,router: '/pages/admin/my-invite',viewPath: 'views/my-invite/index.vue',keepAlive: 1},
-        {id: '1101',parentId: 11,name: '邀请开店',type: 1,icon: 'iconyaoqingyouli',orderNum: 11,router: '/pages/admin/my-invite',viewPath: 'views/my-invite/index.vue',keepAlive: 1},
+		{id: '11',parentId: null,name: '邀请',type: 1,icon: 'iconyaoqingyouli',orderNum: 11,router: '/pages/admin/my-invite',viewPath: 'views/my-invite/index.vue',keepAlive: 1},
+        {id: '1101',parentId: 11,name: '邀请注册',type: 1,icon: 'iconyaoqingyouli',orderNum: 11,router: '/pages/admin/my-invite',viewPath: 'views/my-invite/index.vue',keepAlive: 1},
 		{id: '12',parentId: null,name: '资产',type: 0,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/list',viewPath: 'views/assets/list.vue',keepAlive: 1},
 		{id: '1201',parentId: '12',name: '收入明细',type: 1,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/list',viewPath: 'views/assets/list.vue',keepAlive: 1},
 		{id: '1202',parentId: '12',name: '支出明细',type: 1,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/expendList',viewPath: 'views/assets/expendList.vue',keepAlive: 1},

ghs/src/views/home.vue

@@ -175,7 +175,7 @@ export default {
 					url: '/item/list'
 				},
 				{
-					name: '邀请开店',
+					name: '邀请注册',
 					icon: 'iconyaoqingyouli',
 					url: '/pages/admin/my-invite'
 				}

ghs/src/views/in/list.vue

@@ -55,8 +55,9 @@
       </template>
 
       <template #slot-column-option="{scope}">
-        <el-button @click.stop="printOrder(scope.row)" size="mini" type="primary">入库改价</el-button>
-        <el-button @click.stop="detailShowFn(scope.row)" size="mini" type="success">订单详情</el-button>
+        <el-button @click.stop="printOrder(scope.row)" size="medium" type="primary">改价入库</el-button>
+        <el-button @click.stop="detailShowFn(scope.row)" size="medium" type="success">详情</el-button>
+        <el-button @click.stop="detailShowFn(scope.row)" size="medium" type="primary">取消</el-button>
       </template>
 
     </x-crud>
@@ -191,25 +192,25 @@ export default {
                 prop: 'yfPayWay',
                 label: '支付方式',
                 align: 'center',
-                width: 100
+                width: 90
               },
               {
                 prop: 'status',
                 label: '状态',
                 align: 'center',
-                width: 100
+                width: 90
               },
               {
                 prop: 'entryTime',
                 label: '入库时间',
                 align: 'center',
-                width: 150
+                width: 140
               },
               {
                 prop: 'addTime',
                 label: '创建时间',
                 align: 'center',
-                width: 150
+                width: 140
               },
             ],
             on: {
@@ -228,7 +229,7 @@ export default {
             op: {
               visible: true,
               props: {
-                width: 260,
+                width: 300,
                 align: 'center',
                 fixed: 'right',
                 label: '操作'

ghs/src/views/my-invite/index.vue

@@ -11,7 +11,7 @@
 				</div>
 				<div class="avatar-wrap-right">
 					<div class="app-size-32 avatar-name">{{ shopInfo.shopName }}</div>
-					<el-tag size="mini">普通代理</el-tag>
+					<el-tag size="mini">黄金商家</el-tag>
 				</div>
 			</div>
 			<div class="assets-list-wrap flex-center">
@@ -140,9 +140,9 @@ export default {
 			this.$service.single.assetDet().then(res => {
 				if (this.$util.isEmpty(res)) return false;
 				this.data = res;
-				this.userData[0].value = res.inviteNum || 0;
-				this.userData[1].value = res.payNum || 0;
-				this.userData[2].value = res.income || 0.00;
+				this.userData[0].value = 0;
+				this.userData[1].value = 0;
+				this.userData[2].value = 0;
 			});
 		},
 		handleClick(tab, e) {

ghs/src/views/order/list.vue

@@ -314,7 +314,7 @@ export default {
                 prop: 'shopAdminName',
                 label: '开单人',
                 align: 'center',
-                width: 100
+                width: 130
               },
               {
                 prop: 'addTime',