From b332bf4bde52627f1259741ed89bb7347153904c Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Mon, 22 Jan 2024 11:43:58 +0800
Subject: [PATCH] 11

---
 pages/.DS_Store                   | Bin 10244 -> 10244 bytes
 pages/index/feedBack.vue          |  65 ++++++++++++++++++++++++------
 pages/index/index.vue             |  11 ++---
 pages/inventory/addGoods.vue      |   3 +-
 pages/rebate/rebateShare.vue      |   2 +-
 pages/staff/clock/clock.vue       |  19 +++++----
 pages/staff/signRule/signRule.vue |  58 ++++++++++++++++++++------
 7 files changed, 115 insertions(+), 43 deletions(-)

diff --git a/pages/.DS_Store b/pages/.DS_Store
index 306edbe6ea29f897c4fd802886571d4efed9b2b9..67dd1a480220fe621bc2f0c72ea39b6ba4c29641 100644
GIT binary patch
delta 498
zcmZn(XbIS0D5!SXm4ShQogs-KlOYEPGa2$2(sT1&T#|C~lYlZDK+NFYH#uBTfep&6
z6;xtWn7lwRlWE4I$=pIR%nS?-leL5t!L*-{GUJBLMM6@HOtX$p?h}>*>S}n9GI#Pi
zVHp_ng0L(Tv%=>0!rqKbVUH(I5EbJ`wXtDxqNqC9xI|Iu$;(9fm^Ltglx;pEs>Udn
z0(1u}(5d+h=^*E#YZVZe2Wj1GBp$}dl-e}8O9JEuhQHq@PhKSfas!xoMnaBp!sgc!
zR*Wi2jX*Irh9ZVkU??OqlrW^C8p&{2bIN2-DLIf<5HnXwfze@epOhJ+i_cS_7%M|D
tP*Wm98bcbY#s*Q%zN3!lDpHVw7NlY_hm0I!!De+CVNTkG#$+S$O8`CZefIzW

delta 498
zcmZn(XbIS0D5&;wEdv7sJ3|sfCPNMoW-{b4r03?lxFqG|Cjn(R?zO~TdDu8PTu^}x
z%B&SsVsx0iKroYuS9&tHkPP!1_wAFlgcQNFpO7-6z~&+$DMqHK&6E3trP!`d-uL28
z)8uu+GBD-^VOb`o1DoFqdowcm-kUr@RE!_l#`7=sO->Y5XNJ(ylb4C|F)d&KDcgKT
zRE<$?HPBhCK&R$2q=TG`tTo`?`^f_0^2|VbvypfhBa=qf<Sq#*Hv0`bx8KX2yh=g_
z#yle-$LO&6wS*O;iZ}<*KsJUVhE!lEBr=pRq#_%cc@wPFQ%a5v%FLBgU^Lj=CuPRy
zV*eZLmSUi$M20kmG-Qq1Dh5XcyN)`dt4M(dEkwm+4jDPdgw5(Q!kn}VjmbvhmjLa9
BpV9yT

diff --git a/pages/index/feedBack.vue b/pages/index/feedBack.vue
index 852965e..e937217 100644
--- a/pages/index/feedBack.vue
+++ b/pages/index/feedBack.vue
@@ -3,15 +3,15 @@
 	<view>
 		<view class="formBox">
 			<uni-forms ref="form" :modelValue="formData" :rules="rules" labelWidth="85px">
-				<uni-forms-item label="图片" name="productPicture">
+				<uni-forms-item label="问题图片" name="productPicture">
 					<view v-if="formData.productPicture !=''">
 						<img :src="formData.productPicture" alt="" class="upload-img">
 					</view>
 					<u-upload :fileList="formData.productPicture" @afterRead="afterRead" @delete="deletePic" name="1" multiple
 						:maxCount="1"></u-upload>
 				</uni-forms-item>
-				<uni-forms-item label="描述" name="productIntro">
-					<uni-easyinput type="textarea" autoHeight v-model="formData.productIntro" placeholder="请简要说明问题"
+				<uni-forms-item label="问题说明" name="productIntro">
+					<uni-easyinput type="textarea" autoHeight v-model="formData.productIntro" placeholder="请简要描述问题"
 						trim="all" />
 				</uni-forms-item>
 			</uni-forms>
@@ -19,6 +19,7 @@
 			<u-button type="primary" @tap.stop="submit()">保存</u-button>
 			
 		</view>
+		<!-- <u-modal v-model="show" :content="content"></u-modal> -->
 	</view>
 </template>
 
@@ -26,11 +27,28 @@
 	export default {
 		data() {
 			return {
+				fileList1: [],
 				formData: {
 					productPicture: [],
 					productIntro: ''
+				},
+				categoryList: [],
+				productId:'',
+				arrtList: [],
+				arrtChange: [],
+				dataList:[],
+				rules: {
+					productIntro: {
+						rules: [{
+							required: true,
+							errorMessage: '请简要描述问题',
+						}, ],
+					}
 				}
 			}
+		},
+		onLoad(option) {
+			
 		},
 		methods: {
 			// 删除图片
@@ -42,7 +60,8 @@
 				
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
-				if (this.formData.productPicture == undefined) this.formData.productPicture = [];
+				if (this.formData.productPicture == undefined) this.formData.productPicture = [];
+				console.log(this[`fileList${event.name}`])
 				let fileListLen = this[`fileList${event.name}`].length
 				
 				lists.map((item) => {
@@ -84,22 +103,22 @@
 						}
 					});
 				})
+			},
+			categoryChange(e) {
+
 			},
 			// 触发提交表单
 			submit() {
 				let that = this;
 				let url = ''
-				this.$refs.form.validate().then(res => {
-					if(that.dataList !=''){
-						url = '/app/product/edit'
-						res.id = that.dataList.id
-					}else{
-						url = '/app/product/save'
-					}
-					that.tui.request(url, "post", res, false, false).then((res1) => {
+				this.$refs.form.validate().then(res => {
+					that.tui.request('/app/problemFeedback/saveOrUpdateProblemFeedback', "post", {
+						problemPicture:that.formData.productPicture,
+						problemContent:that.formData.productIntro
+					}, false, false).then((res1) => {
 						if (res1.code == 200) {
 							uni.navigateBack({
-								delta: 2 
+								delta: 2
 							})
 						} else {
 							uni.showToast({
@@ -123,6 +142,26 @@
 		border-radius: 14rpx;
 		box-shadow: 0px 1px 10px 2px #e2e2e2;
 		background-color: #fff;
+
+		.uni-data-select {
+			width: 100%;
+		}
+
+		.attrs {
+			text {
+				display: inline-block;
+				border: 1px solid $u-primary;
+				padding: 7px 20rpx;
+				margin: 20rpx;
+				background-color: #fff;
+				color: $u-primary;
+			}
+
+			.checkedText {
+				background-color: $u-primary;
+				color: #fff;
+			}
+		}
 	}
 	.upload-img{
 		width: 160rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a08bf2b..d2870e2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -205,13 +205,14 @@
 		// },
 		onShow() {
 			this.shopName = uni.getStorageSync('shopName')
-			this.type = uni.getStorageSync('type')
+			this.type = uni.getStorageSync('type')
+			this.getSaleInfo()
+			this.getServerData();
+			this.getOrderInfoList();
+			this.getWaitCount()
 		},
 		onLoad() {
-			this.getSaleInfo()
-			this.getServerData();
-			this.getOrderInfoList();
-			this.getWaitCount()
+			
 		},
 		methods: {
 			getWaitCount() {
diff --git a/pages/inventory/addGoods.vue b/pages/inventory/addGoods.vue
index 3f35176..d54b53f 100644
--- a/pages/inventory/addGoods.vue
+++ b/pages/inventory/addGoods.vue
@@ -151,7 +151,8 @@
 				
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
-				if (this.formData.productPicture == undefined) this.formData.productPicture = [];
+				if (this.formData.productPicture == undefined) this.formData.productPicture = [];
+				console.log(this[`fileList${event.name}`])
 				let fileListLen = this[`fileList${event.name}`].length
 				
 				lists.map((item) => {
diff --git a/pages/rebate/rebateShare.vue b/pages/rebate/rebateShare.vue
index 4ae3470..bf91034 100644
--- a/pages/rebate/rebateShare.vue
+++ b/pages/rebate/rebateShare.vue
@@ -43,7 +43,7 @@
 	.content {
 		width: 100%;
 		height: 100%;
-		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/abdc5c897c4f4fe198b74091a708030b.jpg') no-repeat;
+		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/352c2490d88b47ac84bf13bfa046abcf.png') no-repeat;
 		background-size: cover;
 		background-position: center;
 		overflow: hidden;
diff --git a/pages/staff/clock/clock.vue b/pages/staff/clock/clock.vue
index d11e790..39bccd4 100644
--- a/pages/staff/clock/clock.vue
+++ b/pages/staff/clock/clock.vue
@@ -40,8 +40,7 @@
 	</view>
 </template>
 
-<script>
-	import amap from '../../../common/ossutil/amap-wx.130.js'
+<script>
 	import {
 		mapState
 	} from 'vuex'
@@ -75,15 +74,15 @@
 				})
 			},
 			onClock() {
-				const amapObject = new amap.AMapWX({ key: 'f06653d65bcefa97e94ab08917389842' })
-				amapObject.getRegeo({
-					success: (res) => {
-
-					},
-					fail: (err) => {
-
+				uni.getLocation({
+					type: 'wgs84',
+					isHighAccuracy:true,
+					accuracy:'best',
+					success: function (res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
 					}
-				})
+				});
 				// if (!this.isClock) {
 				// 	this.tui.request("/app/clockIn/", "get", {
 				// 		userId: this.userId
diff --git a/pages/staff/signRule/signRule.vue b/pages/staff/signRule/signRule.vue
index 39dda72..5ff6895 100644
--- a/pages/staff/signRule/signRule.vue
+++ b/pages/staff/signRule/signRule.vue
@@ -13,9 +13,13 @@
 						<view class="uni-input">{{addForm.endTime}}</view>
 					</picker>
 				</uni-forms-item>
-				<uni-forms-item label="定位" required>
+				<uni-forms-item label="定位" name="latitude" required>
 					<input type="text" v-model="addForm.latitude + ','+addForm.longitude" style="text-align:center;width:70%;border: 1px solid #eee;height: 72rpx;line-height: 72rpx !important;" disabled placeholder="获取位置用于员工打卡">
 					<view class="dw-btn" @tap="clockPosi">一键定位</view>
+				</uni-forms-item>
+				<uni-forms-item label="打卡范围" name="categoryId" required>
+					<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="formData.categoryId"
+						placeholder="请选择打卡范围"></uni-data-select>
 				</uni-forms-item>
 			</uni-forms>
 			<u-button type="primary" @click="onFormSubmit">保存</u-button>
@@ -23,8 +27,7 @@
 	</view>
 </template>
 
-<script>
-	import amap from '../../../common/ossutil/amap-wx.130.js'
+<script>
 	export default {
 		data() {
 			return {
@@ -32,7 +35,32 @@
 					startTime: '06:00',
 					endTime: '14:00',
 					latitude:'',
-					longitude:''
+					longitude:'',
+					categoryId: '',
+				},
+				categoryList: [{
+					value: 1,
+					text: '100米'
+				},{
+					value: 2,
+					text: '200米'
+				},{
+					value: 3,
+					text: '500米'
+				}],
+				rules: {
+					categoryId: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择打卡范围',
+						}],
+					},
+					latitude: {
+						rules: [{
+							required: true,
+							errorMessage: '请定位店铺位置',
+						}],
+					}
 				}
 			}
 		},
@@ -44,16 +72,17 @@
 				this.time = e.detail.value;
 			},
 			clockPosi(){
-				const amapObject = new amap.AMapWX({ key: 'f06653d65bcefa97e94ab08917389842' })
-				amapObject.getRegeo({
-					success: (res) => {
-					    this.addForm.latitude = res[0].latitude
-						this.addForm.longitude = res[0].longitude
-					},
-					fail: (err) => {
-
+				let that = this;
+				uni.getLocation({
+					type: 'wgs84',
+					isHighAccuracy:true,
+					accuracy:'best',
+					success: function (res) {
+						console.log(res)
+						that.addForm.latitude = res.latitude
+						that.addForm.longitude = res.longitude
 					}
-				})
+				});
 			},
 			onFormSubmit() {
 				this.$refs.addForm.validate().then(async () => {
@@ -106,5 +135,8 @@
 		text-align: center;
 		background: #088FEB;
 		color: #fff;
+	}
+	.uni-data-select {
+		width: 100%;
 	}
 </style>
\ No newline at end of file