Merge branch 'master' of https://git.banshouhui.com/liuwenhu/account-book

manifest.json

@@ -2,8 +2,8 @@
     "name" : "扳手记账",
     "appid" : "__UNI__EDB8C7C",
     "description" : "",
-    "versionName" : "1.3.5",
-    "versionCode" : 135,
+    "versionName" : "1.3.6",
+    "versionCode" : 136,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/maintain-bill/components/show-collection.vue

@@ -44,7 +44,8 @@
 					</view>
 				</view>
 				<view class="voucher-table-value" v-else>
-					<text v-if="item.childrenValue">{{ detail[item.value][item.childrenValue] || '' }}</text>
+					<text v-if="item.childrenValue1">{{(detail[item.value][item.childrenValue] || '') + '&nbsp;&nbsp;&nbsp;&nbsp;' + (detail[item.value][item.childrenValue1] || '') }}</text>
+					<text v-else-if="item.childrenValue">{{ detail[item.value][item.childrenValue] || '' }}</text>
 					<text v-else>{{ detail[item.value] || '' }}</text>
 				</view>
 			</view>
@@ -346,7 +347,7 @@ export default {
 					views: [
 						{
 							type: 'text',
-							text: item.childrenValue ? this.detail[item.value][item.childrenValue] || '' : this.detail[item.value] || ''
+							text: item.childrenValue ? (item.childrenValue1 ? ((this.detail[item.value][item.childrenValue] || '') + '\u00A0\u00A0\u00A0\u00A0' + (this.detail[item.value][item.childrenValue1] || '')) : (this.detail[item.value][item.childrenValue] || '')) : this.detail[item.value] || ''
 						}
 					]
 				};

pages/maintain-bill/create.vue

@@ -610,7 +610,7 @@ export default {
 			});
 		},
 		async getAddress() {
-			return false;
+			// return false;
 			if (this.platform !== '4') {
 				getSetting('scope.userLocation', '检测到您没打开获取位置权限，该信息将用于获取所在位置，是否去设置打开？', res => {
 					this.chooseLocation();

pages/mine/service/service.vue

@@ -16,15 +16,30 @@
 					<text class="time-text">09:00 - 20:00</text>
 				</view>
 			</view>
-			<view class="QRcodeImage"><image class="" :src="QRcodeURL" :show-menu-by-longpress="true" @tap="QRcodeClick"></image></view>
-			<view class="serviceText">长按识别二维码添加好友入群</view>
+			<!-- <view class="QRcodeImage"><image class="" :src="QRcodeURL" :show-menu-by-longpress="true" @tap="QRcodeClick"></image></view>
+			<view class="serviceText">长按识别二维码添加好友入群</view> -->
+			<view class="QRcodeImage weChart" v-if="showButton">
+				<ab-button content="联系微信客服" :customStyle="{fontSize:'28rpx'}" @click="openServiceChat"></ab-button>
+			</view>
+			<view class="QRcodeImage" v-else>
+				<image class="" :src="QRcodeURL" :show-menu-by-longpress="true" @tap="QRcodeClick"></image>
+			</view>
+			<view class="serviceText">{{showButton?'点击上方按钮跳转微信客服':'长按识别二维码添加好友入群'}}</view>
 		</view>
 	</view>
 </template>
 
 <script>
 import { mineBaseUrl } from '@/utils/config.js';
+import AbButton from '@/components/common/ab-button.vue';
+
+import {
+		mapGetters
+	} from "vuex"
 export default {
+	components: {
+			AbButton
+		},
 	data() {
 		return {
 			//正式
@@ -33,6 +48,12 @@ export default {
 			image: mineBaseUrl + 'lianxikefu@3x.png'
 		};
 	},
+	computed: {
+			...mapGetters(['platform']),
+			showButton() {
+				return this.platform==='4' || this.platform == '1'
+			}
+		},
 	methods: {
 		QRcodeClick: function() {
 			uni.previewImage({
@@ -40,7 +61,57 @@ export default {
 				// 当前显示图片的http链接
 				urls: this.imgUrls // 需要预览的图片http链接列表
 			});
-		}
+		},
+		openServiceChat() {
+				// #ifdef MP-WEIXIN
+				console.log('-------------MP-WEIXIN-----------')
+				wx.openCustomerServiceChat({
+					extInfo: {url: 'https://work.weixin.qq.com/kfid/kfc3dfcb7cba4e2e5ca'},
+					corpId: 'ww48902f287a01843c',
+					success(res) {
+						console.log("success:", JSON.stringify(res))
+					},
+					complete(res) {
+						console.log("complete:", JSON.stringify(res))
+					}
+				})
+				return true
+				// #endif
+				
+				// #ifdef APP-PLUS
+				console.log('-------------APP-PLUS-----------')
+				let wechat = null
+				plus.share.getServices(res => {
+					wechat = res.find(i => i.id === 'weixin')
+					if (wechat) {
+						wechat.openCustomerServiceChat({
+							corpid: 'ww48902f287a01843c', //企业ID
+							url: 'https://work.weixin.qq.com/kfid/kfc3dfcb7cba4e2e5ca', //客服地址
+						}, src => {
+							console.log("success:", JSON.stringify(src))
+						}, err => {
+							console.log("error:", JSON.stringify(err))
+						})
+					} else {
+						uni.showToast({
+							title: '当前环境不支持微信操作',
+							icon: "error"
+						});
+					}
+				}, function() {
+					uni.showToast({
+						title: "获取服务失败，不支持该操作。" + JSON.stringify(e),
+						icon: 'none'
+					})
+				});
+				return true
+				// #endif
+
+				uni.showToast({
+					title: '请在app打开',
+					icon: "none"
+				});
+			}
 	}
 };
 </script>
@@ -99,7 +170,9 @@ export default {
 	width: 400rpx;
 	height: 400rpx;
 }
-
+.weChart {
+		height: 88rpx;
+	}
 .top-image {
 	width: 100%;
 	height: 240rpx;

utils/options/maintain-bill/collection.js

@@ -43,6 +43,7 @@ export const tableCellOptions = [
 	{
 		value: "customer",
 		childrenValue:'name',
+		childrenValue1: 'phone',
 		label: "今收到",
 	},
 	{
@@ -69,6 +70,7 @@ export const canvasTableCellOptions = [
 	{
 		value: "customer",
 		childrenValue:'name',
+		childrenValue1: 'phone',
 		label: "今收到",
 	},
 	{