Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

# Conflicts:
#	pages/mall/index.vue

manifest.json

@@ -35,18 +35,21 @@
             "android" : {
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
@@ -77,7 +80,9 @@
                         "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325",
                         "appkey_android" : "877848546f7f3717101a17c33e1d4df3"
                     }
-                }
+                },
+                "share" : {},
+                "oauth" : {}
             }
         },
         "uniStatistics" : {

pages/client-detail/base-paper-deals.vue

@@ -70,7 +70,6 @@ export default {
 				// customerEnterpriseId: '651107734133018624', // 客户企业ID
 				// mallSupplierId: '670334117090562048', // 供应商id
 				status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
-				enterpriseIds: [] //企业ID集合网关获取
 			},
 			pagination: {
 				pageNum: 0, // 初始会执行一次下拉加载
@@ -93,7 +92,7 @@ export default {
 		// 顶部统计数据
 		getOrderVolumeStatistics() {
 			getOrderVolumeStatistics(this.orderParams).then(res => {
-				console.log('原纸交易顶部统计数据', res)
+				// console.log('原纸交易顶部统计数据', res)
 				this.topInfo = res
 			})
 		},
@@ -101,7 +100,7 @@ export default {
 			return new Promise((resolve, reject) => {
 				getBasePaperDeals({ ...this.params, ...this.pagination })
 					.then(res => {
-						console.log('原纸交易', res)
+						// console.log('原纸交易', res)
 						if (res) {
 							if (this.pagination.pageNum == 1) {
 								this.list = res.records

pages/mall/index.vue

@@ -2,12 +2,12 @@
 	<view class="warpper">
 		<uni-nav-bar>
 			<view slot="left" class="left-title">纸商城</view>
-			<view slot="right" class="right-title">分享</view>
-		</uni-nav-bar>
-		<view class="top-box">
-			<view class=""><image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image></view>
-			<view class="center">
-				<view class="title">东莞市隆兴纸业有限公司</view>
+			<view slot="right" class="right-title" @tap="shareTap">分享</view>
+		</uni-nav-bar>
+		<view class="top-box">
+			<view class=""><image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image></view>
+			<view class="center">
+				<view class="title">{{ storeInformation.name }}</view>
 				<view class="desc">全部商品 39 &nbsp; | &nbsp;上新 9</view>
 			</view>
 			<view class="right">
@@ -59,7 +59,7 @@
 
 <script>
 import uGap from '@/components/u-gap/u-gap.vue'
-import { back, go2, loginG2 } from '@/utils/hook.js'
+import { back, go2, loginGo2 } from '@/utils/hook.js'
 import { SupplierList, productStatus } from '@/apis/add-paper.js'
 import noData from './no-data.vue'
 export default {
@@ -67,6 +67,10 @@ export default {
 	data() {
 		return {
 			pageShow: true,
+			storeInformation: {
+				supplierId: null,
+				name: null
+			},
 			option: {
 				size: 10,
 				auto: true,
@@ -92,6 +96,12 @@ export default {
 			listData: []
 		}
 	},
+	onShow() {
+		this.storeInformation = {
+			supplierId: this.$store.state.supplierInfo.supplierId,
+			name: this.$store.state.supplierInfo.name
+		}
+	},
 	onLoad() {
 		this.quertData()
 	},
@@ -143,7 +153,7 @@ export default {
 		},
 		// 切换商城按钮
 		checkMall() {
-			go2('switching-mall')
+			go2('switching-mall', { supplierId: this.storeInformation.supplierId })
 		},
 		// 按钮点击事件
 		nativeTo() {
@@ -166,7 +176,7 @@ export default {
 		},
 		// 详情点击事件
 		detailInfo(item) {
-			go2('paper-detail', item)
+			loginGo2('paper-detail', item)
 		},
 		// 上下架事件
 		productStatusChange(item) {
@@ -188,6 +198,24 @@ export default {
 					
 				}
 			})
+		},
+		// 分享
+		shareTap() {
+			uni.share({
+			    provider: "weixin",
+			    scene: "WXSceneSession",
+			    type: 0,
+			    href: "http://uniapp.dcloud.io/",
+			    title: "uni-app分享",
+			    summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！",
+			    imageUrl: "https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-uni-app-doc/d8590190-4f28-11eb-b680-7980c8a877b8.png",
+			    success: function (res) {
+			        console.log("success:" + JSON.stringify(res));
+			    },
+			    fail: function (err) {
+			        console.log("fail:" + JSON.stringify(err));
+			    }
+			});
 		}
 	}
 }

pages/switching-mall/index.vue

@@ -7,51 +7,61 @@
 				<view slot="right"></view>
 			</uni-nav-bar>
 		</view>
-		<view class="" v-for="(item,index) in enterpriseList" :key="index" @click="checkCompany(item, index)">
+		<view class="" v-for="(item, index) in enterpriseList" :key="index" @click="checkCompany(item, index)">
 			<uni-list>
 				<uni-list-item>
 					<!-- 自定义 header -->
-					<view slot="header" class="slot-box"><image class="slot-image check-mall-image" src="/static/logo.png" mode="widthFix"></image></view>
+					<view slot="header" class="slot-box"><image class="slot-image check-mall-image" :src="item.logo || '/static/logo.png'" mode="scaleToFill"></image></view>
 					<!-- 自定义 body -->
 					<view slot="body" class="slot-box check-mall-text">
-						<view class="check-mall-text-textTitle"><text>{{item.name}}</text></view>
-						<view class="check-mall-text-textSubTitle"><text>全部商品39</text></view>
+						<view class="check-mall-text-textTitle">
+							<text>{{ item.name }}</text>
+						</view>
+						<view class="check-mall-text-textSubTitle">
+							<text>全部商品{{ item.productNumber }}</text>
+						</view>
 					</view>
-					<view v-if="activeIndex === index" slot="footer" class="slot-box check-mall-sure"><icon type="success_no_circle" size="26" /></view>
+					<view v-if="supplierId === item.supplierId" slot="footer" class="slot-box check-mall-sure"><icon type="success_no_circle" size="26" /></view>
 				</uni-list-item>
 			</uni-list>
 		</view>
-		
 	</view>
 </template>
 
 <script>
 import { back, go2 } from '@/utils/hook.js'
 import { getStoreList } from '@/apis/add-paper.js'
+import store from '@/store/index'
 export default {
 	data() {
 		return {
-			activeIndex: 0,
-			companyData:[],
-			enterpriseList:[],
+			companyData: [],
+			enterpriseList: [],
+			supplierId: null
 		}
 	},
-	onLoad() {
+	onLoad(option) {
+		this.supplierId = option.supplierId
 		this.queryData()
 	},
 	methods: {
 		back,
 		queryData() {
-			getStoreList().then((res) => {
+			getStoreList().then(res => {
 				console.log('==', res)
-				this.enterpriseList = res.enterpriseList
+				this.enterpriseList = res
 			})
 		},
 		// 选择切换企业
-		checkCompany(){
-			this.activeIndex = 0
-				go2('mall')
-		},
+		checkCompany(item) {
+			this.$store.commit('setSupplierInfo', {
+				id: item.id,
+				name: item.name,
+				fddEnterpriseStatus: this.$store.state.supplierInfo.fddEnterpriseStatus,
+				supplierId: item.supplierId
+			})
+			go2('mall')
+		}
 	}
 }
 </script>
@@ -69,7 +79,7 @@ export default {
 	.check-mall-image {
 		width: 100rpx;
 		height: 100rpx;
-		border-radius: 50rpx;
+		border-radius: 50%;
 	}
 	.check-mall-text {
 		line-height: 60rpx;