团队管理修改

pages/group/modules/list/index.scss

@@ -59,7 +59,8 @@
                 color: #333333;
             }
 
-            .role {
+            .row {
+                display: flex;
                 width: 100%;
                 height: 34rpx;
                 line-height: 34rpx;
@@ -67,6 +68,11 @@
                 font-family: PingFang SC-Regular, PingFang SC;
                 color: #999999;
                 margin-top: 8rpx;
+
+                view {
+                    flex-shrink: 0;
+                    padding-right: 20rpx;
+                }
             }
         }
 

pages/group/modules/list/index.wxml

@@ -12,20 +12,18 @@
                 <view class="title line-1">
                     {{item.name}}
                 </view>
-                <view class="role line-1">
-                    {{language['职位']||'职位'}}：{{item.position||" --"}}
+                <view class="row">
+                    <view class="line-1" style="width: 220rpx;">职位：{{item.position||" --"}}</view>
+                    <view class="line-1">营销区域：{{item.areanames||" --"}}</view>
                 </view>
             </view>
-            <!--  <navigator wx:if="{{ismyteam && !item.identity}}" url='#' class="delete-box" data-item="{{item}}" bindtap="{{item.userid!=teamleaderId?'handleDelete':'changeUser'}}">
-            <text class="iconfont {{item.userid!=teamleaderId?'icon-shanchu':'icon-bianji1'}}" />
-        </navigator> -->
         </view>
         <view slot="right" class="van-swipe-cell__right">
             <navigator url="#" class="edit" data-item="{{item}}" bindtap="openPopup">
-                {{language['设置权限']||'设置权限'}}
+                设置权限
             </navigator>
             <navigator url="#" class="delete" data-item="{{item}}" bindtap="handleDelete">
-                {{language['删除']||'删除'}}
+                删除
             </navigator>
         </view>
     </van-swipe-cell>
@@ -34,10 +32,10 @@
 
 <van-popup show="{{ show }}" position="bottom" bind:click-overlay='onCancel' z-index='99999999'>
     <view class="popup-title">
-        {{language['设置权限']||'设置权限'}}
+        设置权限
     </view>
     <view class="popup-explain">
-        {{language['请设置参与人权限']||'请设置参与人权限'}}：
+        请设置参与人权限
     </view>
     <van-radio-group value="{{ changeItem.editable+'' }}">
         <view class="popup-item" bindtap="changeRadio" data-name="1">

pages/login/phone.js

@@ -4,7 +4,8 @@ Page({
         disabled: true, //是否禁用
         loading: false, //登陆中
         register: null,
-        showDialog: false
+        showDialog: false,
+        showLogo: false
     },
     async onLoad() {
         if (wx.getStorageSync('isAgree')) this.setData({
@@ -13,6 +14,15 @@ Page({
         this.setData({
             devCount: 0,
         })
+        const deviceInfo = wx.getDeviceInfo();
+        this.setData({
+            showLogo: !deviceInfo.system.includes("iOS 26")
+        })
+        if (this.data.showLogo) setTimeout(() => {
+            this.setData({
+                showLogo: true
+            })
+        }, 1500)
     },
     /* 修改授权 */
     isAgreeChange() {

pages/login/phone.wxml

@@ -1,5 +1,5 @@
 <view class="logo">
-	<image src="/static/image/logo.png" bindtap="todev" />
+	<image wx:if="{{showLogo}}" src="/static/image/logo.png" bindtap="todev" />
 </view>
 
 <!-- 手机号登录  -->

project.config.json

@@ -59,7 +59,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.19.4",
-    "appid": "wxa78dcac45940aceb",
+    "appid": "wxb00809948b4c8038",
     "projectname": "miniprogram-92",
     "condition": {},
     "editorSetting": {

project.private.config.json

@@ -10,12 +10,26 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "prsx/dealer/insert",
+                    "pathName": "prsx/dealer/insert",
+                    "query": "",
+                    "scene": null,
+                    "launchMode": "default"
+                },
+                {
+                    "name": "经销商档案",
+                    "pathName": "prsx/dealer/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "医院详情",
                     "pathName": "prsx/hospital/detail",
                     "query": "id=6737",
-                    "scene": null,
-                    "launchMode": "default"
+                    "launchMode": "default",
+                    "scene": null
                 },
                 {
                     "name": "新建市场活动",

prsx/activity/detail.js

@@ -8,17 +8,8 @@ Page({
     },
     onLoad(options) {
         const appAuth = wx.getStorageSync('auth').wmarketing_activity;
-        let tabsList = [{
-            label: "详细信息",
-            icon: "icon-tabxiangxixinxi1"
-        }, {
-            label: "参与医生",
-            icon: "icon-yisheng",
-            model: "#Doctors"
-        }];
         this.setData({
             sat_campaignid: options.id,
-            tabsList,
             appAuth
         })
         this.getDetail();
@@ -166,7 +157,14 @@ Page({
             editdataleader = isLeader ? 1 : 0,
             tabbarList = [],
             appAuth = this.data.appAuth,
-            tabsList = this.data.tabsList;
+            tabsList = [{
+                label: "详细信息",
+                icon: "icon-tabxiangxixinxi1"
+            }, {
+                label: "参与医生",
+                icon: "icon-yisheng",
+                model: "#Doctors"
+            }];
         if (!isLeader) {
             let res = await getApp().agentOrNot("sat_campaign", this.data.sat_campaignid),
                 data = res.code == '1' ? res.data : {

prsx/activity/detail.wxml

@@ -10,7 +10,7 @@
 </view>
 <view style="margin-top: -16rpx;">
     <Yl_Detail list="{{briefs}}">
-        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" slot='bottom' ownertable='sat_campaign' ownerid='{{sat_campaignid}}' />
+        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" add="{{isLeader}}" slot='bottom' ownertable='sat_campaign' ownerid='{{sat_campaignid}}' />
     </Yl_Detail>
 </view>
 <view style="height: 20rpx;" />

prsx/department/detail.wxml

@@ -10,7 +10,7 @@
 </view>
 <view style="margin-top: -16rpx;">
     <Yl_Detail list="{{briefs}}">
-        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" slot='bottom' ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' />
+        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" add="{{isLeader}}" slot='bottom' ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' />
     </Yl_Detail>
 </view>
 <view style="height: 20rpx;" />

prsx/doctors/detail.wxml

@@ -11,7 +11,7 @@
 
 <view style="margin-top: -16rpx;">
     <Yl_Detail list="{{briefs}}">
-        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" slot='bottom' ownertable='sa_doctor' ownerid='{{sa_doctorid}}' />
+        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" add="{{isLeader}}" slot='bottom' ownertable='sa_doctor' ownerid='{{sa_doctorid}}' />
     </Yl_Detail>
 </view>
 <view style="height: 20rpx;" />

prsx/hospital/detail.js

@@ -11,29 +11,8 @@ Page({
     },
     onLoad(options) {
         const appAuth = wx.getStorageSync('auth').wCustomer;
-        let tabsList = [{
-            label: "详细信息",
-            icon: "icon-tabxiangxixinxi1"
-        }, {
-            label: "科室",
-            icon: "icon-keshi",
-            model: "#Department"
-        }, {
-            label: "医生",
-            icon: "icon-yisheng",
-            model: "#Doctors"
-        }, {
-            label: "推荐产品",
-            icon: "icon-tuijianchanpin",
-            model: "#Product"
-        }, {
-            label: "地址管理",
-            icon: "icon-tabdizhi",
-            model: "#Address"
-        }];
         this.setData({
             sa_customersid: options.id,
-            tabsList,
             appAuth
         })
         this.getDetail();
@@ -312,7 +291,26 @@ Page({
             editdataleader = isLeader ? 1 : 0,
             tabbarList = [],
             appAuth = this.data.appAuth,
-            tabsList = this.data.tabsList;
+            tabsList = [{
+                label: "详细信息",
+                icon: "icon-tabxiangxixinxi1"
+            }, {
+                label: "科室",
+                icon: "icon-keshi",
+                model: "#Department"
+            }, {
+                label: "医生",
+                icon: "icon-yisheng",
+                model: "#Doctors"
+            }, {
+                label: "推荐产品",
+                icon: "icon-tuijianchanpin",
+                model: "#Product"
+            }, {
+                label: "地址管理",
+                icon: "icon-tabdizhi",
+                model: "#Address"
+            }];
         if (!isLeader) {
             let res = await getApp().agentOrNot("sa_customers", this.data.sa_customersid),
                 data = res.code == '1' ? res.data : {

prsx/hospital/detail.wxml

@@ -10,7 +10,7 @@
 </view>
 <view style="margin-top: -16rpx;">
     <Yl_Detail list="{{briefs}}">
-        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" slot='bottom' ownertable='sa_customers' ownerid='{{sa_customersid}}' />
+        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" add="{{isLeader}}" slot='bottom' ownertable='sa_customers' ownerid='{{sa_customersid}}' />
     </Yl_Detail>
 </view>
 <view style="height: 20rpx;" />

utils/work/apps.js

@@ -23,8 +23,8 @@ function getapps() {
 		icon: "work-shujutongji"
 	}];
 	let app = [...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['通用'], ['通用', '工作汇报']),
-			...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['CRM'], ['业务管理', '数据统计'])
-		],
+	...getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['CRM'], ['业务管理', '数据统计'])
+	],
 		list = [];
 	app.forEach((v, i) => {
 		v.apps.forEach(s => {
@@ -85,6 +85,11 @@ function getcrm() {
 		path: "/packageA/orderForm/index",
 		icon: "work-dingdan",
 		objectname: "sa_order"
+	}, {
+		name: "经销商管理",
+		path: "/prsx/dealer/index",
+		icon: "work-dingdan",
+		objectname: "sa_order"
 	}];
 	let crm = getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['CRM'], ['业务管理', '销售管理', '营销目标']),
 		list = [];