Merge branch '0709_OA' into 11/24SAAS

src/utils/searchArray.js

@@ -715,6 +715,10 @@ export const paymentChannelStatus = [
   {
     value: "ADAPAY",
     label: "汇付"
+  },
+  {
+    value: "YEEPAY",
+    label: "易宝"
   }
 ];
 // 销售类型
@@ -903,7 +907,7 @@ export const levelStatusList = getValueForKey(levelStatus);
 export const evaluateStatusList = getValueForKey(evaluateStatus);
 export const problemTypeList = getValueForKey(problemType);
 export const schoolUserTypeList = getValueForKey(schoolUserType);
-export const shareLiveTypeList = getValueForKey(shareLiveType)
+export const shareLiveTypeList = getValueForKey(shareLiveType);
 //downListType
 function getValueForKey(obj) {
   let arr = [];

src/utils/vueFilter.js

@@ -493,7 +493,8 @@ Vue.filter("paymentChannelStatus", value => {
   let template = {
     YQPAY: "双乾",
     BALANCE: "余额",
-    ADAPAY: "汇付"
+    ADAPAY: "汇付",
+    YEEPAY: "易宝"
   };
   return template[value];
 });

src/views/productService/model/rechargeModel.vue

@@ -142,6 +142,8 @@ export default {
               returnUrl +
               "&notifyUrl=" +
               notifyUrl +
+              "&type=" +
+              res.data.type +
               "&wxAppId=" +
               wxAppId;
             console.log(this.codeUrl, "codeUrl");

src/views/productService/model/serviceModel.vue

@@ -216,6 +216,8 @@ export default {
               returnUrl +
               "&notifyUrl=" +
               notifyUrl +
+              "&type=" +
+              res.data.type +
               "&wxAppId=" +
               wxAppId;
             console.log(this.codeUrl, "codeUrl");