Merge branch 'main' of https://gitea.lihaink.cn/mkm/OfficeApp

components/task/taskitemB.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="c_task_item" @click="clickTask">
+
+
+
+		<!-- {{datas.datas[0].data_field}} -->
 		<view class="personnel_list" v-for="(item ,i) in datas.datas">
 			<view class="cards" v-if="item.ai_question">
 
@@ -8,8 +12,18 @@
 						<view class="">
 							AI提问
 						</view>
+						<view class="" style="white-space: pre-line;">
 							<view class="">
-							{{item.ai_question}}
+								根据以下信息
+							</view>
+							<view class="" style="text-align: left;" v-for="(items,indexs) in item.data_field">
+								{{indexs}} :{{items}}
+
+							</view>
+							<!-- {{item.ai_question}} -->
+							<view class="">
+								请问有那些商机？需要购买哪些商品？
+							</view>
 						</view>
 					</view>
 
@@ -19,7 +33,7 @@
 						<view class="">
 							AI回答
 						</view>
-						<view class="">
+						<view class="" style="white-space: pre-line;">
 							{{item.ai_aianalyse}}
 						</view>
 					</view>

manifest.json

@@ -14,6 +14,9 @@
 		"compatible": {
 			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
 		},
+		"compatible": {
+			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+		},
 		// "statusbar": {
 		//   "immersed": false
 		// },

pages/logistics/deliveryDetil.vue

@@ -69,10 +69,11 @@
 									</text>
 									<view class="goods-tit" style="align-items: center;"
 										v-for="(item,index) in goodsDetil.product" :key="index">
+										<u--image style="flex: 2;" radius='10' :showLoading="true" :src="item.goods_pic"
+											width="100rpx" height="100rpx" @click="click"></u--image>
 										<text style="flex: 6;">{{item.goods_name}}</text>
-										<u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx"
+
-											height="100rpx" @click="click"></u--image>
+										<text style="flex: 1;">X{{item.product_num}}{{item.goods_unit}}</text>
-										<text style="flex: 2;">X{{item.product_num}}{{item.goods_unit}}</text>
 									</view>
 								</view>
 							</view>

pages/logistics/logisticDetil.vue

@@ -214,9 +214,9 @@
 								</text>
 								<view class="goods_tit" style="align-items: center;"
 									v-for="(item,index) in goodsDetil.product">
+									<u--image style="flex: 2;" radius='10' :showLoading="true" :src="item.goods_pic"
+										width="100rpx" height="100rpx"></u--image>
 									<text style="width: 60vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
-									<u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx"
-										height="100rpx" @click="click"></u--image>
 									<text>X{{item.product_num}}{{item.goods_unit}}</text>
 								</view>
 							</view>

subpkg/topUpDeposit/topUpDeposit.vue

@@ -19,11 +19,11 @@
 				</view>
 			</view>
 		</view>
-		<view class="deposit-list" style="padding-top: 30px;">
+		<view class="deposit-list" style="padding-top: 20px;">
 			<view class="card" v-for="(item, index) in list">
 				<view class="item">
 					<view>创建时间:</view>
-					<view class="text" style="color: red;">{{item.create_time}}</view>
+					<view class="text" style="color: black;">{{item.create_time}}</view>
 				</view>
 				<view class="item">
 					<view>充值金额:</view>

subpkg/townTask/townGather.vue

@@ -205,7 +205,7 @@
 				</u-form-item>
 				<u-form-item labelWidth="auto" label="店主年龄" required prop="shopkeeperAge" borderBottom>
 					<u--input :readonly="readonly" type='number' v-model="formData1.shopkeeperAge"
-						placeholder="请输入店主姓名"></u--input>
+						placeholder="请输入店主年龄"></u--input>
 				</u-form-item>
 				<u-form-item labelWidth="auto" label="联系方式" required prop="shopkeeperPhone" borderBottom>
 					<u--input :readonly="readonly" type='number' v-model="formData1.shopkeeperPhone"
@@ -356,6 +356,9 @@
 </template>
 
 <script>
+	import {
+		Toast
+	} from "../../libs/uniApi.js"
 	import {
 		townMasterTask3Commit,
 		townMasterTask3List
@@ -587,9 +590,7 @@
 
 						}
 					})
-					setTimeout(() => {
+
-						uni.navigateBack()
-					}, 1000)
 
 				} else {
 					await townMasterTask3Commit({
@@ -598,21 +599,19 @@
 							supply: [{
 								...this.formData1
 							}],
-
 						}
 					})
+				}
+				Toast("操作成功")
 				setTimeout(() => {
 					uni.navigateBack()
 				}, 1000)
 
-				}
-
-
-			},
-			async nextFormFn() {
-				await this.validate()
-				this.page = 0
 			},
+			// async nextFormFn() {
+			// 	await this.validate()
+			// 	this.page = 0
+			// },
 			async confirm1() {
 				await this.validate()
 				this.commit()