处理永信达遗留项

src/pages/cart/index.vue

@@ -26,7 +26,9 @@
 								}
 								: togoods(item)
 						">
-							<view>{{ item.goodsName }}</view>
+							<!-- <view>{{ item.goodsName }}</view> -->
+							<view style="margin-bottom: 20rpx;">{{ item.productName ? item.productName : item.goodsName
+							}}</view>
 							<view class="b-tag">
 								<block v-for="(item1, index1) in item.specifications?.length" :key="index1">
 									<u-tag :text="item.specifications[index1]" type="info" size="mini"
@@ -73,7 +75,8 @@
 										}
 										: togoods(item)
 								">
-									<view>{{ item.goodsName }}</view>
+									<view>{{ item.productName ? item.productName : item.goodsName
+									}}</view>
 									<view style="color: #ccc; margin-top: 20%;">
 										{{ item.message }}
 									</view>

src/pages/category/index.vue

@@ -26,7 +26,7 @@
 						<view class="content">
 							<view class="title">
 								<text>{{ item.name }}</text>
-								<text style="color: #646566;">{{ item.brief }}</text>
+								<text style="color: #646566; font-size: 12px; overflow: hidden;">{{ item.brief }}</text>
 							</view>
 						</view>
 					</view>
@@ -163,7 +163,7 @@ const initGoodsList = (data: any) => {
 	.item-container {
 		box-sizing: border-box;
 		width: 100%;
-		height: 160rpx;
+		// height: 160rpx;
 		padding: 12rpx 0;
 		display: flex;
 		justify-content: flex-start;
@@ -171,6 +171,7 @@ const initGoodsList = (data: any) => {
 		border-bottom: 1rpx solid #f5f5f5;
 
 		.content {
+			flex: 1;
 			height: 100%;
 			display: flex;
 			flex-direction: column;

src/pages/goods/index.vue

@@ -387,7 +387,7 @@ const initParts = (goodsId: number, productId: number) => {
 		border-bottom-right-radius: 30rpx;
 
 		.goods-title {
-			font-size: 16px;
+			font-size: 28rpx;
 			font-weight: bold;
 			display: -webkit-box;
 			word-break: break-all;

src/pages/index/index.scss

@@ -40,7 +40,7 @@
   margin: 6rpx 10rpx;
 
   .goods-title {
-   font-size: 16px;
+   font-size: 14px;
    font-family: arial, sans-serif;
    display: -webkit-box;
    word-break: break-all;

src/pages/order/editQuotation.vue

@@ -57,7 +57,7 @@
 </template>
 
 <script setup lang="ts">
-import { onLoad } from '@dcloudio/uni-app';
+import { onLoad, onBackPress } from '@dcloudio/uni-app';
 import { ref, computed, nextTick } from 'vue';
 import { quotationInitAgain, fillQuotation } from '@/api/cart';
 import { getTax } from '@/api/index';
@@ -206,11 +206,12 @@ let init = () => {
 	});
 };
 
-// onBackPress((options: any) =>{
-// 	if(options.from === 'navigateBack') {
-// 		return false
-// 	}
-// })
+onBackPress((options: any) => {
+	let pages = getCurrentPages(); // 当前页面路由
+	let route = pages[pages.length - 2].route; // 上一个页面路由
+	if (options.from === 'backbutton' && route == 'pages/order/quotation')
+		return uni.navigateBack({ delta: 4 })
+})
 </script>
 
 <style lang="scss" scoped>

src/pages/order/orderList.vue

@@ -29,7 +29,9 @@
 										" mode="aspectFill"></image>
 									</view>
 									<view class="content">
-										<view class="title u-line-2">{{ item.goodsName }}</view>
+										<view class="title u-line-2">{{ item.productName ? item.productName :
+												item.goodsName
+										}}</view>
 										<view class="type">{{ item.type }}</view>
 										<view class="content-item">
 											<view v-for="(item1, index1) in item.specifications

src/pages/order/quotation.vue

@@ -20,10 +20,9 @@
 									<view
 										style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10rpx;">
 										<text>设置含税单价：</text>
-										<!-- <u-input ref="inputRef" type="number" height="50" style="width: 200rpx;" /> -->
 										<input type="number" placeholder="请输入含税单价" v-model="item.taxUnitPrice"
 											@focus="onPriceFocus" @blur="priceCheck($event, index)"
-											style="width: 200rpx;">
+											style="width: 200rpx; padding: 4rpx 20rpx; border: #9697996e 1rpx solid; border-radius: 12rpx;">
 									</view>
 									<view
 										style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10rpx;">
@@ -324,8 +323,6 @@ let priceCheck = (data: any, index: number) => {
 }
 
 let submit = () => {
-	console.log(detailData.value, 'detailData.value');
-
 	// 保证单价必填
 	new Promise((resolve, reject) => {
 		let flag = true
@@ -388,7 +385,7 @@ let modelConfirm = () => {
 
 // 点击取消按钮
 let modelCancel = () => {
-	uni.reLaunch({
+	uni.navigateTo({
 		url: './editQuotation?orderId=' + orderId.value
 	})
 }

src/pages/productLine/index.vue

@@ -814,7 +814,7 @@ let handleEditProductLineData = (editData: any, dataArr?: any[]) => {
         editData.cartList.forEach((cart: any) => {
             cart.map((item: any) => {
                 if (JSON.stringify(item) !== '{}') {
-                    item['name'] = item.goodsName;
+                    item['name'] = item.productName ? item.productName : item.goodsName;
                     item['show'] = false;
                     item['url'] = item.picUrl;
                     item['status'] = 1;

src/utils/config.ts

@@ -2,7 +2,7 @@ const CONFIG: any = {
     // 开发环境配置
     development: {
         assetsPath: 'http://192.168.60:81', // 静态资源路径
-        // baseUrl: 'http://192.168.0.10:8089', // 后台接口请求地址
+        // baseUrl: 'http://192.168.0.8:8089', // 后台接口请求地址
         baseUrl: 'http://192.168.0.60:81', // 后台接口请求地址
         hostUrl: 'http://192.168.0.60:81', // H5地址(前端运行地址)
         websocketUrl: '', // websocket服务端地址