分包

hdApp/src/admin/billing/affirmPxClass.vue

@@ -143,7 +143,7 @@ export default {
 						createPxClassOrder(options).then(res => {
 							// this.$msg("下单成功");
 							uni.removeStorageSync('affirmPxClass')
-							uni.redirectTo({url:'/common/pageSuccess?title=开单成功'})
+							uni.redirectTo({url:'/admin/admin/common/pageSuccess?title=开单成功'})
 						});
 						// self.formSubmit();
 					}

hdApp/src/common/redirect.vue → hdApp/src/admin/common/redirect.vue

@@ -28,10 +28,6 @@ export default {
 		// 	getWxQrCodeQuery({ scene: scene }).then(res => {
 		// 		uni.hideLoading()
 		// 		if (res.data.url.indexOf('https://') > -1) {
-		// 			const returnUrl = encodeURIComponent(res.data.url)
-		// 			uni.navigateTo({
-		// 				url: `/common/webview?returnUrl=${returnUrl}`
-		// 			})
 		// 		} else {
 		// 			uni.redirectTo({
 		// 				url: res.data.url

hdApp/src/admin/home/workbench.vue

@@ -346,7 +346,7 @@ export default {
     // 新学员列表
     goNewStudent () {
       uni.navigateTo({
-        url: '/admin/home/newStudent'
+        url: '/admin/student/newStudent'
       })
     },
     // 续费

hdApp/src/admin/member/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-content">
+  <div class="app-content" :style="{ backgroundImage: `url(${constant.imgUrl}/member/bg.png)` }">
     <!-- 客户信息 -->
     <div class="module-com user-info">
       <div class="user-wrap">
@@ -561,7 +561,6 @@ export default {
 
 <style lang='scss' scoped>
 .app-content {
-  background-image: url("../../static/images/member/bg.png");
   background-size: 100% 330px;
   background-repeat: no-repeat;
   padding-top: 30px;

hdApp/src/admin/statistics/index.vue

@@ -74,9 +74,9 @@
 </template>
 
 <script>
-import EchartTrend from '@/admin/home/components/echart-trend'
-import EchartCircle from '@/admin/home/components/echart-circle'
-import EchartColumnar from '@/admin/home/components/echart-columnar'
+import EchartTrend from './components/echart-trend'
+import EchartCircle from './components/echart-circle'
+import EchartColumnar from './components/echart-columnar'
 import DropdownList from '@/components/plugin/dropdown-list'
 // api
 import { getStatList } from '@/api/statistics'

hdApp/src/common/webview.vue

@@ -1,36 +0,0 @@
-<template>
-	<web-view :src="src"></web-view>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-// import { getSelfInfo } from '@/utils/auth'
-
-export default {
-	data() {
-		return {
-			src: '',
-			roleName: ''
-		}
-	},
-	computed: {
-		// ...mapGetters({ userInfo: 'getSelfInfo' })
-	},
-	onLoad(option) {
-	},
-	/**
-		 * 用户点击右上角分享
-		 */
-	onShareAppMessage: function(option) {
-		let shareObj = {}
-		shareObj = {
-			title: this.userInfo.nick_name + this.userInfo.role_name,
-			path: `/pages/design/designCompany/indexNew?${params}`
-		}
-		return shareObj
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

hdApp/src/components/module/app-avatar.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import defaultImg from '@/static/images/user/attr-default.png'
+import defaultImg from '@/static/images/default-img.png'
 export default {
 	name: 'avatar-module',
 	props: {

hdApp/src/filters/index.js

@@ -25,8 +25,5 @@ Vue.filter('default_img', function(url) {
 })
 
 Vue.filter('default_avatar', function(url) {
-	if (!url) {
-		return require('@/static/images/user/attr-default.png')
-	}
 	return url
 })

hdApp/src/mixins/globalMixins.js

@@ -118,7 +118,7 @@ export default {
               status = '3'
             }
             this.$util.pageTo({
-              url: '/admin/home/result',
+              url: '/admin/common/result',
               query: {
                 status
               }

hdApp/src/pages.json

@@ -7,27 +7,6 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		{
-			"path": "admin/home/result",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "admin/home/callback",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "admin/home/newStudent",
-			"style": {
-				"navigationBarTitleText": "新学员",
-				"enablePullDownRefresh": true
-			}
-		},
 		{
 			"path": "admin/home/order",
 			"style": {
@@ -62,29 +41,53 @@
 			"style": {
 				"navigationBarTitleText": "商城"
 			}
-		},
+		}
+	],
+	"subPackages": [
 		{
-			"path": "common/redirect",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
+			"root": "admin/student",
+			"pages": [
+				{
+					"path": "newStudent",
+					"style": {
+						"navigationBarTitleText": "新学员",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
 		},
 		{
-			"path": "common/webview",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
+			"root": "admin/common",
+			"pages": [
+				{
+					"path": "result",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "callback",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "redirect",
+					"style": {
+						"navigationBarTitleText": "加载中..."
+					}
+				},
+				{
+					"path": "pageSuccess",
+					"style": {
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationBarTextStyle": "black"
+					}
+				}
+			]
 		},
-		{
-			"path": "common/pageSuccess",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}
-	],
-	"subPackages": [
 		{
 			"root": "admin/share",
 			"pages": [

hdApp/src/pagesArrears/details.vue

@@ -199,7 +199,7 @@ export default {
     // 支付成功
     async paySuccess (parameter) {
       await clearOrderApi(parameter);
-      uni.navigateTo({ url: '/common/pageSuccess?title=收款成功' });
+      uni.navigateTo({ url: '/admin/admin/common/pageSuccess?title=收款成功' });
       // this.$util.pageTo(1);
     },
     payFail () {

hdApp/src/pagesClient/official/renewal.vue

@@ -71,7 +71,7 @@ export default {
     // 支付成功
     paySuccess() {
       this.$util.pageTo({
-        url: "/admin/home/callback",
+        url: "/admin/common/callback",
         type: 2
       });
     },

hdApp/src/pagesPurchase/details.vue

@@ -348,7 +348,7 @@ export default {
 
 				this.resetSelectInfoByType(this.pageType);
 				// this.$util.pageTo({ url: "/pagesPurchase/result", type: 2 });
-				uni.navigateTo({url:'/common/pageSuccess?title=新增成功'})
+				uni.navigateTo({url:'/admin/admin/common/pageSuccess?title=新增成功'})
 			} catch (error) {}
 		},
 		// 表单验证

hdApp/src/pagesStatistics/business.vue

@@ -2,7 +2,7 @@
 <view>
 	<scroll-view scroll-y class="business-page">
 		<template v-if="!$util.isEmpty(baseInfo)">
-			<view class="business-info">
+			<view class="business-info" :style="{ backgroundImage: `url(${constant.imgUrl}/admin/bg2.png)` }">
 				<view class="amount-view">
 					<text class="amount-label">账户余额</text>
 					<!--<view v-if="loginInfo.switchShop" class="amount-btn">-->
@@ -400,8 +400,6 @@ export default {
 		width: 100%;
 		height: 300upx;
 		padding: 30upx;
-		// background: linear-gradient(30deg, #3ab7ff, #38a6ff, #3386ff);
-		background: url(../static/images/admin/bg2.png) no-repeat;
 		background-size: 100% 100%;
 		color: #fff;
 

hdApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -260,7 +260,7 @@ export default {
 			await createStockOutOrderApi(formData);
 			this.$msg("确认成功");
 			this.clearSelectList();
-			uni.navigateTo({url:'/common/pageSuccess?title=出库成功'});
+			uni.navigateTo({url:'/admin/admin/common/pageSuccess?title=出库成功'});
 			// uni.navigateBack({delta: 1});
 		},
 	}