0.0

src/api/axios.js

@@ -55,7 +55,7 @@ service.interceptors.response.use(
 					message: response.data.msg,
 					type: 'error',
 				})
-				return Promise.reject(response.data.msg)
+			return Promise.reject(response.data.msg)
 			}
 		}else{
 			Message({
@@ -73,10 +73,11 @@ service.interceptors.response.use(
 			// })
 			return Promise.reject(error.message)
 		}else if(error.message=='Network Error'){
-			Message({
-				message: '网络异常，请检查网络是否畅通，再重新进入应用',
-				type: 'error',
-			})
+			// Message({
+			// 	message: '网络异常，请检查网络是否畅通，再重新进入应用',
+			// 	type: 'error',
+			// })
+			console.log('网络异常，请检查网络是否畅通，再重新进入应用')
 			return Promise.reject(error.message)
 		}else if(error.message=='timeout of 20000ms exceeded'){
 			Message({

src/components/bonusPointsPopup.vue

@@ -12,6 +12,7 @@
 							</el-col>
 						</el-row>
 					</el-form-item>
+					<slot></slot>
 					<div v-for="(item, index) in dialogData.items" :key="index" @click.stop="itemIndex = index">
 						<div style="overflow: hidden;">
 							<span style="line-height: 36px;">录入明细({{ index + 1 }})</span>
@@ -148,8 +149,10 @@
 				<EmployeeSelector
 					v-if="show_employee_selector"
 					ref="members"
+					:isChecKedAll="false"
 					:isCreatorSelect="true"
 					:user_no_select="false"
+					:max="10"
 					:employee_list="manage_scope"
 					:selected="employee_selected"
 					@confirm="move_employee_confirm"
@@ -407,7 +410,6 @@ export default {
 					const resultData = res.data.data;
 					this.rule_item_list = resultData.tree;
 					this.flatteningIntegralRules = this.getItemDetail(this.rule_item_list);
-					console.log(this.flatteningIntegralRules)
 					this.loading = false;
 				}
 			});

src/hint.vue

@@ -23,6 +23,7 @@ export default {
 		};
 	},
 	created() {
+		console.log(this.IsPC())
 		this.width = document.body.clientWidth + 'px';
 	},
 	mounted() {
@@ -44,17 +45,29 @@ export default {
 		}
 	},
 	methods: {
+		IsPC() {
+		    var userAgentInfo = navigator.userAgent;
+		    var Agents = ["Android", "iPhone","SymbianOS", "Windows Phone","iPad", "iPod"];
+		    var flag = true;
+		    for (var v = 0; v < Agents.length; v++) {
+		        if (userAgentInfo.indexOf(Agents[v]) > 0) {
+		            flag = false;
+		            break;
+		        }
+		    }
+		    return flag;
+		},
 		init() {
 			// 开发者自行判断调用这个方法的时机
 			openTryoutSku({
 				// corpId可以从应用首页的url上获取到
 				corpId: this.corpId,
-				// corpId: 'ding18d2ac9042d997e5f5bf40eda33b7ba0',
+				// corpId: 'ding897857ddc9137670ffe93478753d9884',
 				// 应用的appId
 				appId: 55493,
 				// 从应用首页的url上获取到，url上参数名为 purchaseToken。
 				// purchaseToken如何配置参照下文”配置入口地址“章节。
-				// token: this.token,
+				token: this.token,
 				miniAppId: this.type == 'APP' ? 5000000000104741 : '' // 如果是三方小程序应用，需要设置一下自身的miniAppId。H5微应用可以不设置这个参数
 			}).then(res => {
 				const {
@@ -70,7 +83,12 @@ export default {
 					if (this.type == 'APP') {
 						close({});
 					} else {
-						openLink({ url:'https://pc.dd.g107.com?corpId=' + corpId }).then(() => close({}));
+						if(this.IsPC()){
+							window.location.replace('https://pc.dd.g107.com?corpId=' + corpId)
+						}else{
+							openLink({ url:'https://pc.dd.g107.com?corpId=' + corpId }).then(() => close({}));
+						}
+						
 					}
 				}
 			})

src/main.js

@@ -21,7 +21,7 @@ import userImage from '@/components/UserImage'
 Vue.component('userImage', userImage)
 Vue.use(ElementUI);
 if (process.env.NODE_ENV === 'development') {
-  new VConsole()
+  // new VConsole()
 }
 
 Vue.prototype.$echarts = echarts

src/views/abPoint/award_punish.vue

@@ -218,7 +218,9 @@
 			</div>
 		</el-drawer>
 
-		<bonusPointsPopup :title="popuTitle" :visible.sync="popupVisible" :refresh.sync="refreshData" :integralType.sync="integralType"></bonusPointsPopup>
+		<bonusPointsPopup :title="popuTitle" :visible.sync="popupVisible" :refresh.sync="refreshData" :integralType.sync="integralType">
+			<div style="text-align: center;position: relative;top: -10px;" class="yellow">最多只能选择10人</div>
+		</bonusPointsPopup>
 	</div>
 </template>
 

src/views/set/voluntarilyPoint.vue

@@ -772,7 +772,7 @@ export default {
 				type: 'warning'
 			}).then(() => {
 				this.disabled = true;
-				this.$axios('post','/api/integral/rule/items/destroy',{item_id: item.id}).then(res => {
+				this.$axios('post','/api/integral/rule/items/destroy',{item_ids:JSON.stringify([item.id])}).then(res => {
 						if (res.data.code == 1) {
 							this.$message.success('删除成功');
 							this.rules_detail_show = false;