From ae9b64082ca2ad23e442e802daa555f94d2a0a62 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 23 Feb 2023 10:21:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/OtherOrderServices.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crmeb/app/services/order/OtherOrderServices.php b/crmeb/app/services/order/OtherOrderServices.php
index 2c81611b5..64d08c4ad 100644
--- a/crmeb/app/services/order/OtherOrderServices.php
+++ b/crmeb/app/services/order/OtherOrderServices.php
@@ -563,6 +563,9 @@ class OtherOrderServices extends BaseServices
                     case "alipay" :
                         $v['pay_type'] = "支付宝";
                         break;
+                    case 'allinpay':
+                        $v['pay_type'] = "通联支付";
+                        break;
                     case "admin" :
                         $v['pay_type'] = "后台赠送";
                         break;

From b1a6235536166642ccecc390dc58c24adc20742e Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 23 Feb 2023 10:48:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?improve:=20=E6=9B=B4=E6=96=B0=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/components/header-bar/header-bar.vue |  2 +-
 .../sider-trigger/sider-trigger.less          |  4 +++-
 .../sider-trigger/sider-trigger.vue           | 21 ++++++++++++++++---
 .../main/components/side-menu/side-menu.vue   | 14 ++++++++++++-
 template/admin/src/components/main/main.vue   |  6 +++---
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/template/admin/src/components/main/components/header-bar/header-bar.vue b/template/admin/src/components/main/components/header-bar/header-bar.vue
index 64c9c3466..9c3d95959 100644
--- a/template/admin/src/components/main/components/header-bar/header-bar.vue
+++ b/template/admin/src/components/main/components/header-bar/header-bar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="header-bar">
-    <sider-trigger :collapsed="collapsed" @on-change="handleCollpasedChange"></sider-trigger>
+    <!-- <sider-trigger :collapsed="collapsed" @on-change="handleCollpasedChange"></sider-trigger> -->
     <!-- <span class="i-layout-header-trigger" @click="handleReload">
       <Icon type="ios-refresh" color='#fff' />
     </span> -->
diff --git a/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.less b/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.less
index 039954fb8..ac3ca9194 100644
--- a/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.less
+++ b/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.less
@@ -8,8 +8,10 @@
   height: @size;
   display: inline-block;
   text-align: center;
-  color: #fff;
+  // color: #fff;
   margin-top: 5px;
+  cursor: pointer;
+  z-index: 9999;
   .iconcaidanshouqi {
     .trans;
     vertical-align: top;
diff --git a/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue b/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue
index ed7d87156..98db00fcd 100644
--- a/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue
+++ b/template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue
@@ -1,7 +1,9 @@
 <template>
-  <a @click="handleChange" type="text" :class="['sider-trigger-a', collapsed ? 'collapsed' : '']"
-    ><i class="iconfont" color='#fff' :class="collapsed ? 'iconcaidanzhankai' : 'iconcaidanshouqi'"></i
-  ></a>
+  <div class="sider-menu" @click="handleChange">
+    <a type="text" :class="['sider-trigger-a', collapsed ? 'collapsed' : '']"
+      ><i class="iconfont" color="#fff" :class="collapsed ? 'iconcaidanzhankai' : 'iconcaidanshouqi'"></i
+    ></a>
+  </div>
 </template>
 <script>
 export default {
@@ -25,6 +27,19 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.sider-menu {
+  position: absolute;
+  width: 100%;
+  max-width: 90px;
+  left: 0;
+  bottom: 0;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-top: 1px solid #d9dadd;
+  color: #515a6e;
+}
 @import './sider-trigger.less';
 .sider-trigger-a {
   padding: 14px 6px;
diff --git a/template/admin/src/components/main/components/side-menu/side-menu.vue b/template/admin/src/components/main/components/side-menu/side-menu.vue
index a29dddde8..6ef47f2b9 100644
--- a/template/admin/src/components/main/components/side-menu/side-menu.vue
+++ b/template/admin/src/components/main/components/side-menu/side-menu.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="side-menu-wrapper">
     <slot></slot>
+    <sider-trigger :collapsed="collapsed" @on-change="handleCollpasedChange"></sider-trigger>
     <div class="side-menu-box" v-show="!collapsed">
       <div class="parent-menu">
         <Menu
@@ -99,6 +100,8 @@ import { getUnion } from '@/libs/tools';
 import { mapState } from 'vuex';
 import mixin from './mixin';
 import itemMixin from './item-mixin';
+import { setCookies } from '@/libs/util';
+import siderTrigger from '../header-bar/sider-trigger';
 
 export default {
   name: 'SideMenu',
@@ -106,6 +109,7 @@ export default {
   components: {
     SideMenuItem,
     CollapsedMenu,
+    siderTrigger,
   },
   props: {
     menuList: {
@@ -196,7 +200,12 @@ export default {
         }
       });
     },
-
+    handleCollpasedChange(state) {
+      console.log(state);
+      this.collapsed = state;
+      this.$emit('on-coll-change', state);
+      setCookies('collapsed', state);
+    },
     handleSelect(name, type) {
       this.childOptions = [];
       this.menuList.map((e) => {
@@ -290,6 +299,9 @@ export default {
 <style lang="less">
 @import './side-menu.less';
 .ivu-menu {
+  .side-menu-wrapper {
+    position: relative;
+  }
   .side-menu-wrapper a.drop-menu-a {
     padding: 1px !important;
   }
diff --git a/template/admin/src/components/main/main.vue b/template/admin/src/components/main/main.vue
index 1a0333a0b..ca549ff19 100644
--- a/template/admin/src/components/main/main.vue
+++ b/template/admin/src/components/main/main.vue
@@ -10,8 +10,7 @@
         <language v-if="$config.useI18n" @on-lang-change="setLocal" style="margin-right: 10px" :lang="local" />
         <header-notice></header-notice>
         <fullscreen v-model="isFullscreen" style="margin-right: 10px" />
-        <Reload  @on-reload="handleReload"></Reload>
-
+        <Reload @on-reload="handleReload"></Reload>
         <error-store
           v-if="$config.plugin['error-store'] && $config.plugin['error-store'].showInHeader"
           :has-read="hasReadErrorPage"
@@ -34,6 +33,7 @@
         <side-menu
           accordion
           ref="sideMenu"
+          @on-coll-change="handleCollapsedChange"
           :active-name="$route.path"
           :collapsed="collapsed"
           @on-select="turnToPage"
@@ -104,7 +104,7 @@ export default {
     iCopyright,
     HeaderSearch,
     HeaderNotice,
-    Reload
+    Reload,
   },
   data() {
     return {

From 32d09199d49f31eebee496de8d1e5ba8d37c3c11 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 23 Feb 2023 10:48:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20svip=E8=B4=AD=E4=B9=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/components/payment/index.vue   | 7 +------
 template/uni-app/pages/annex/vip_paid/index.vue | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/template/uni-app/components/payment/index.vue b/template/uni-app/components/payment/index.vue
index c42fbf850..9e65ab255 100644
--- a/template/uni-app/components/payment/index.vue
+++ b/template/uni-app/components/payment/index.vue
@@ -169,7 +169,7 @@
 				}).then(res => {
 					let jsConfig = res.data.result.jsConfig;
 					console.log(paytype)
-					if (res.data.status === 'ALLINPAY_PAY') {
+					if (res.data.status == 'ALLINPAY_PAY') {
 						uni.hideLoading();
 						// #ifdef MP
 						wx.openEmbeddedMiniProgram({
@@ -197,11 +197,6 @@
 						// #endif
 						// #ifdef APP-PLUS
 						plus.runtime.openURL(jsConfig.payinfo);
-						setTimeout(e => {
-							uni.reLaunch({
-								url: goPages
-							})
-						}, 1000)
 						// #endif
 						// #ifdef H5
 						this.formpost(res.data.result.pay_url, jsConfig)
diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue
index 50a7a9957..daeb1c6c3 100644
--- a/template/uni-app/pages/annex/vip_paid/index.vue
+++ b/template/uni-app/pages/annex/vip_paid/index.vue
@@ -552,8 +552,8 @@
 							}
 						})
 						this.jumpData = {
-							orderId: res.data.result.orderId,
-							msg: res.msg,
+							orderId: data.data.result.orderId,
+							msg: data.msg,
 						}
 						// #endif
 						// #ifdef APP-PLUS
@@ -565,7 +565,7 @@
 						}, 1000)
 						// #endif
 						// #ifdef H5
-						this.formpost(res.data.result.pay_url, jsConfig)
+						this.formpost(data.data.result.pay_url, jsConfig)
 						// #endif
 						break;
 					case 'PAY_ERROR':