jwyu 3 年之前
父节点
当前提交
0030a8b482

+ 4 - 1
api/user.js

@@ -41,9 +41,12 @@ export const apiUserLogin=params=>{
  * @param company_name 公司名
  * @param permission 选择的权限
  * @param real_name 姓名
+ * @param source 来源:我的1、活动2、图库3、研报4
+ * @param source_agent 来源平台:1:小程序、2:pc
+ * @param from_page 来源页面: '活动列表'、'活动详情'等
  */
 export const apiApplyPermission=params=>{
-	return httpPost('/user/apply',params)
+	return httpPost('/user/apply',{...params,source_agent:1})
 }
 
 /**

+ 5 - 1
pages-activity/noAuthority.vue

@@ -43,6 +43,8 @@ export default {
                apiApplyPermission({
                     company_name:this.info.customer_info.company_name,
                     real_name:this.info.customer_info.name,
+                    source:2,
+                    from_page:'活动详情'
                 }).then(res=>{
                     if(res.code===200){
                         console.log('主动申请成功');
@@ -63,12 +65,14 @@ export default {
                 }else{
                     if(!this.info.customer_info.status||this.info.customer_info.status!='流失'){
                         uni.redirectTo({
-                            url:"/pages-applyPermission/applyPermission?source=2"
+                            url:"/pages-applyPermission/applyPermission?source=2&from_page=活动详情"
                         })
                     }else{//主动调一次申请权限接口 
                         const res=await apiApplyPermission({
                             company_name:this.info.customer_info.company_name,
                             real_name:this.info.customer_info.name,
+                            source:2,
+                            from_page:'活动详情'
                         })
                         if(res.code===200){
                             this.pupData.show=true

+ 4 - 1
pages-applyPermission/applyPermission.vue

@@ -79,10 +79,12 @@ export default {
                 permission: '',
             },
             source:"",//来源 1-我的 2-活动 3-图库
+            from_page:''
         }
     },
     onLoad(options){
         this.source=options.source
+        this.from_page=options.from_page
         this.addEventListenerPermission()
     },
     onUnload(){
@@ -127,7 +129,8 @@ export default {
                 company_name:this.form.companyName,
                 permission:this.form.permission,
                 real_name:this.form.name,
-                source:Number(this.source)
+                source:Number(this.source),
+                from_page:this.from_page
             }
             if(!params.company_name){
                 uni.showToast({

+ 4 - 0
pages/activity/activity.vue

@@ -351,6 +351,7 @@ export default {
                                     company_name:res.data.customer_info.company_name,
                                     real_name:res.data.customer_info.name,
                                     source:2,
+                                    from_page:'活动列表'
                                 }).then(res=>{
                                     if(res.code===200){
                                         console.log('主动申请成功');
@@ -643,6 +644,7 @@ export default {
                                 company_name:res.data.customer_info.company_name,
                                 real_name:res.data.customer_info.name,
                                 source:2,
+                                from_page:'活动列表'
                             }).then(res=>{
                                 if(res.code===200){
                                     console.log('主动申请成功');
@@ -720,6 +722,7 @@ export default {
                                 company_name:res.data.customer_info.company_name,
                                 real_name:res.data.customer_info.name,
                                 source:2,
+                                from_page:'活动列表'
                             }).then(res=>{
                                 if(res.code===200){
                                     console.log('主动申请成功');
@@ -778,6 +781,7 @@ export default {
                         company_name:this.pupData.customer_info.company_name,
                         real_name:this.pupData.customer_info.name,
                         source:2,
+                        from_page:'活动列表'
                     })
                     if(res.code===200){
                         this.pupData.content=`<p>申请已提交</p><p>请等待销售人员与您联系</p>`

+ 2 - 1
pages/chart/component/noAuth.vue

@@ -68,12 +68,13 @@ export default {
                     company_name:this.info.customer_info.company_name,
                     real_name:this.info.customer_info.name,
                     source:3,
+                    from_page:'图库列表'
                 }).then(res=>{
                     uni.navigateTo({url:'/pages-applyPermission/applyResult'})
                 })
                 return
             }
-            uni.navigateTo({ url: '/pages-applyPermission/applyPermission?source=3' })
+            uni.navigateTo({ url: '/pages-applyPermission/applyPermission?source=3&from_page=图库列表' })
         }
     }
 }

+ 3 - 1
pages/user/user.vue

@@ -109,7 +109,7 @@
 				if(res.code===200){
 					if(!res.data){
 						uni.navigateTo({
-							url:"/pages-applyPermission/applyPermission?source=1"
+							url:"/pages-applyPermission/applyPermission?source=1&from_page=我的"
 						})
 					}else{
 						this.pupData.show=true
@@ -130,6 +130,8 @@
 				apiApplyPermission({
                     company_name:this.userInfo.company_name,
                     real_name:this.userInfo.real_name,
+					source:1,
+                    from_page:'我的'
                 }).then(res=>{
                     if(res.code===200){
                         console.log('主动申请成功');