免费续期

hdApp/src/admin/home/apply.vue

@@ -100,15 +100,6 @@
                             url: "/pagesStatistics/business"
                         }
                         ]
-                    },{
-                        title:'资金管理',
-                        list:[
-                             {
-                            name: "客户欠款",
-                            img: `${this.$constant.imgUrl}/ghs/home/khqk.png`,
-                            url: "/pagesArrears/list"
-                            }
-                        ]
                     }
                 ]
             }

hdApp/src/admin/home/workbench.vue

@@ -56,14 +56,14 @@
 				class="news-list"
 				v-for="(item, index) in data.notice"
 				:key="index"
-				@click="pageToFn(item)"
+				@click="pageToFn(item.page)"
 			>
 				<div class="news-left">
-					<i class="iconfont iconxiaoxi2"></i>
+					<i class="iconfont iconxiaoxi2 ling"></i>
 					<span>{{ item.title }}</span>
 				</div>
 				<div class="news-right">
-					<span>立即授权绑定</span>
+					<span>{{ item.action }}</span>
 					<i class="iconfont iconxiangyou"></i>
 				</div>
 			</div>
@@ -196,26 +196,11 @@ export default {
 					img: `${this.$constant.imgUrl}/ghs/home/gj.png`,
 					url: "/admin/billing/priceChange"
 				},
-				{
-					name: "调拨出库",
-					img: `${this.$constant.imgUrl}/ghs/home/dbck.png`,
-					url: "/pagesStorehouse/allot/allotEx"
-				},
-				{
-					name: "调拨入库",
-					img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
-					url: "/pagesStorehouse/allot/allotPut"
-				},
 				{
 					name: "花材管理",
 					img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
 					url: "/pagesStorehouse/flower/manage"
 				},
-				{
-					name: "客户欠款",
-					img: `${this.$constant.imgUrl}/ghs/home/khqk.png`,
-					url: "/pagesArrears/list"
-				},
 				{
 					name: "员工管理",
 					img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
@@ -334,12 +319,10 @@ export default {
 			});
 		},
 		// 跳转
-		pageToFn(item) {
-			// #ifdef H5
-			location.href = item.url;
-			// #endif
-			// #ifndef H5
-			// #endif
+		pageToFn(page) {
+			this.$util.pageTo({
+				url: page
+			});
 		},
 		// 续费
 		renewFn() {
@@ -354,8 +337,8 @@ export default {
 		getMyMall(){
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
-					appId: res.data.hd.miniAppId,
-					path: 'admin/ghs/shop',
+					appId: res.data.mall.miniAppId,
+					path: 'pages/home/index?account='+this.loginInfo.shopId,
 					//develop 开发板 trial 体验版 release 正式版
 					envVersion: 'develop',
 					extraData: {
@@ -466,9 +449,12 @@ export default {
 				color: $mainColor;
 				margin-right: 10px;
 			}
+			.ling{
+				font-size:28rpx;
+			}
 		}
 		.news-right {
-			font-size: 24px;
+			font-size: 26px;
 			color: $mainColor;
 			transform: scale(0.9);
 			@include disFlex(flex-end, flex-start);

hdApp/src/admin/recharge/renew.vue

@@ -0,0 +1,29 @@
+<template>
+	<div class="app-content">
+        免费续期
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'recharge-renew',
+	data() {
+		return {
+		}
+	},
+	onLoad() {
+	},
+	methods: {
+		init() {
+			this._getDet()
+		},
+		_getDet() {
+
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

hdApp/src/constant/index.js

@@ -24,7 +24,7 @@ const envVal = {
 
 // #ifdef H5
 envVal.formal = process.env.NODE_ENV == 'development' ? 'https://ghs.huaml.com' : `${window.location.protocol}//${window.location.host}`
-envVal.hostUrl = process.env.NODE_ENV == 'development' ? `https://api.shop.hzghd.com` : `${window.location.protocol}//api.${window.location.host}`
+envVal.hostUrl = process.env.NODE_ENV == 'development' ? `https://api.shop.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
 // #endif
 
 // #ifdef MP-WEIXIN

hdApp/src/manifest.json

@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.shop.hzghd.com",
+                    "target": "http://api.shop.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

hdApp/src/pages.json

@@ -399,6 +399,17 @@
 				}
 			]
 		},
+		{
+			"root": "admin/recharge",
+			"pages": [
+				{
+					"path": "renew",
+					"style": {
+						"navigationBarTitleText": "免费续期"
+					}
+				}
+			]
+		},
 		{
 			"root": "admin/billing",
 			"pages": [

hdApp/src/pagesPurchase/details.vue

@@ -283,7 +283,6 @@ export default {
 				}
 
 				const { data } = await getPurchaseDetailApi(orderSn);
-				console.log(11111, data);
 				Object.keys(this.form).forEach((i, index) => {
 					// if (i != 'password') {
 					this.form[i] = data[i];

hdApp/src/utils/socket.js

@@ -17,7 +17,7 @@ const SocketConfig = {
 };
 class SocketUtil {
 	constructor({ url, onOpen, onMessage, onClose, onError }) {
-		this.url = url || "api.shop.hzghd.com:8282";
+		this.url = url || "api.shop.huaml.com:8282";
 		this.socket = this.connectSocket(this.url);
 		this.onOpenCall = onOpen;
 		this.onMessageCall = onMessage;

mallApp/src/manifest.json

@@ -83,7 +83,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wxe41bd5816affd0ba",
         "setting" : {
             "urlCheck" : false
         },