From 79491193ad6872b0bfca1be4d38784b8762006c5 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 24 Jul 2022 11:41:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AE=8C=E5=96=84=EF=BC=8C=E6=B3=A8=E9=87=8A=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                            |  4 ++--
 components/goods-card/horizontal-goods-card.vue |  2 +-
 components/goods-card/vertical-goods-card.vue   |  2 +-
 pages.json                                      | 11 +----------
 pages/my/Certification.vue                      |  8 ++++----
 pages/my/b-account-bind.vue                     | 13 ++++++++-----
 pages/my/my-order.vue                           | 10 +++++-----
 pages/product/product-detail.vue                |  8 +++++---
 pages/product/product-pick.vue                  |  8 ++++----
 9 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 23c8c7c..59d9c04 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -10,9 +10,9 @@ export default {
 					title: '加载中'
 				})
 				// request 触发前拼接 url 
-				// args.url = 'https://www.opsoul.com' + args.url;
+				args.url = 'https://www.opsoul.com' + args.url;
 				// args.url = 'http://120.79.136.57' + args.url;
-				args.url = 'http://127.0.0.1:80' + args.url;
+				// args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data) {
 					args.data.deptId = globalData.deptId;
 					args.data.from = globalData.from;
diff --git a/components/goods-card/horizontal-goods-card.vue b/components/goods-card/horizontal-goods-card.vue
index 561e6fa..a1e5c47 100644
--- a/components/goods-card/horizontal-goods-card.vue
+++ b/components/goods-card/horizontal-goods-card.vue
@@ -5,7 +5,7 @@
 		<view class="margin-left-sm product-content">
 			<view>
 				<view class="text-black">{{product.goodsName}}</view>
-				<view class="text-sm" v-if="ifShowComments">{{product.remark}}</view>
+				<view class="text-sm" v-if="ifShowComments">{{product.goodsDesc}}</view>
 			</view>
 			<view class="flex justify-between align-center">
 				<view v-if="product.discountPrice" class="flex justify-start align-center">
diff --git a/components/goods-card/vertical-goods-card.vue b/components/goods-card/vertical-goods-card.vue
index 195c195..fec5c0f 100644
--- a/components/goods-card/vertical-goods-card.vue
+++ b/components/goods-card/vertical-goods-card.vue
@@ -20,7 +20,7 @@
 				<view class="cu-item item-margin-custom">					
 					<view class="content flex-sub">
 						<view class="text-xl">{{item.goodsName}}</view>
-						<view class="text-sm text-gray margin-tb-xs">{{item.remark}}</view>
+						<view class="text-sm text-gray margin-tb-xs">{{item.goodsDesc}}</view>
 						<view class="flex justify-between align-end">
 							<view class="text-red text-sm">自营直选，不满意重新服务，全程上险</view>
 							<view class="text-red text-price text-xl">{{item.goodsStandardList[0].goodsPrice}}</view>
diff --git a/pages.json b/pages.json
index 59aaa8a..50883bd 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,6 @@
 {
 	"pages": [{
-		"path": "pages/index/index"
-		// "path": "components/multi-level-nav/vertical-nav"
+		"path": "pages/index/index"
 	}],
 	"subPackages": [{
 		"root": "pages/order/",
@@ -33,14 +32,6 @@
 			"path": "my-address"
 		}, {
 			"path": "edit-address"
-		}, {
-			"path": "my-operator"
-		}, {
-			"path": "contract"
-		}, {
-			"path": "apply-operator"
-		}, {
-			"path": "Certification"
 		}, {
 			"path": "my-team-member"
 		}, {
diff --git a/pages/my/Certification.vue b/pages/my/Certification.vue
index 557e1af..9563bc4 100644
--- a/pages/my/Certification.vue
+++ b/pages/my/Certification.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="margin-bottom-lg">
 		<!-- 顶部操作条 -->
-		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
+		<!-- <cu-custom :bgColor="'bg-main-color'" :isBack="true">
 			<block slot="backText">返回</block>
 			<block slot="content">实名认证</block>
-		</cu-custom>
+		</cu-custom> -->
 		<!-- 表单 -->
-		<view class="margin-lr-sm margin-top-sm">
+		<!-- <view class="margin-lr-sm margin-top-sm">
 			<form @submit="submit">
 				<view class="cu-form-group">
 					<view class="title">姓名</view>
@@ -119,7 +119,7 @@
 					<button class="bg-main-color long-btn" form-type="submit">提交</button>
 				</view>
 			</form>
-		</view>
+		</view> -->
 	</view>
 </template>
 
diff --git a/pages/my/b-account-bind.vue b/pages/my/b-account-bind.vue
index 0f784b2..01ee4f4 100644
--- a/pages/my/b-account-bind.vue
+++ b/pages/my/b-account-bind.vue
@@ -7,11 +7,11 @@
 		</cu-custom>
 		<view class="margin-lr-sm margin-tb-lg shadow-warp">
 			<view class="bg-gray flex justify-start align-center text-xl padding-lr padding-top-xs">
-				<view class="padding-lr padding-tb-sm" :class="curAccountType === '0' ? 'curTab' : ''" data-type="0" @click="changAccountType">支付宝</view>
+				<!-- <view class="padding-lr padding-tb-sm" :class="curAccountType === '0' ? 'curTab' : ''" data-type="0" @click="changAccountType">支付宝</view> -->
 				<view class="padding-lr padding-tb-sm" :class="curAccountType === '1' ? 'curTab' : ''" data-type="1" @click="changAccountType">银行卡</view>
 			</view>
 			<!-- 支付宝 -->
-			<view v-if="curAccountType == '0'" class="bg-white padding text-lg">
+			<!-- <view v-if="curAccountType == '0'" class="bg-white padding text-lg">
 				<view>
 					<view class="margin-bottom-sm">开户人姓名</view>
 					<input type="digit" placeholder="请输入开户人姓名" placeholder-style="color:#989898" v-model="formData.name">
@@ -20,9 +20,9 @@
 					<view class="margin-bottom-sm">支付宝账户</view>
 					<input type="digit" placeholder="请输入支付宝账户" placeholder-style="color:#989898" v-model="formData.account">
 				</view>
-			</view>
+			</view> -->
 			<!-- 银行卡 -->
-			<view v-else-if="curAccountType === '1'" class="bg-white padding text-lg">
+			<view v-if="curAccountType === '1'" class="bg-white padding text-lg">
 				<view>
 					<view class="margin-bottom-sm">开户人姓名</view>
 					<input type="text" placeholder="请输入开户人姓名" placeholder-style="color:#989898" v-model="formData.name">
@@ -55,6 +55,9 @@
 		<view class="margin-lr">
 			<button class="cu-btn lg bg-main-color long-btn shadow-blur" @click="submit">提交</button>
 		</view>
+		<view class="text-red padding">
+			工圈子小程序承诺此账户只用于接收推广收益
+		</view>
 	</view>
 </template>
 
@@ -67,7 +70,7 @@
 		},
 		data() {
 			return {
-				curAccountType: '0',
+				curAccountType: '1',
 				provinceList: [],
 				cityList: [],
 				formData: {
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index c9635d2..9ae9ebc 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -48,17 +48,17 @@
 						</view>
 						<view class="flex justify-end" v-if="tabCur === 1">
 							<button class="cu-btn bg-gray margin-right-sm shadow-blur">取消订单</button>
-							<button class="cu-btn bg-gray margin-right-sm shadow-blur">撤换师傅</button>
-							<button class="cu-btn bg-main-color margin-right-sm shadow-blur">催单</button>
+							<!-- <button class="cu-btn bg-gray margin-right-sm shadow-blur">撤换师傅</button> -->
+							<!-- <button class="cu-btn bg-main-color margin-right-sm shadow-blur">催单</button> -->
 						</view>
 						<view class="flex justify-end" v-if="tabCur === 2">
-							<button class="cu-btn bg-gray margin-right-sm shadow-blur">取消订单</button>
-							<button class="cu-btn bg-gray margin-right-sm shadow-blur">撤换师傅</button>
+							<!-- <button class="cu-btn bg-gray margin-right-sm shadow-blur">取消订单</button> -->
+							<!-- <button class="cu-btn bg-gray margin-right-sm shadow-blur">撤换师傅</button> -->
 							<button class="cu-btn bg-main-color margin-right-sm shadow-blur" @click="showServDetail(shopOrder)">查看</button>
 						</view>
 						<view class="flex justify-end" v-if="tabCur === 3">
 							<!-- <button class="cu-btn bg-gray margin-right-sm shadow-blur">申请售后</button> -->
-							<button class="cu-btn bg-main-color margin-right-sm shadow-blur">加价</button>
+							<!-- <button class="cu-btn bg-main-color margin-right-sm shadow-blur">加价</button> -->
 						</view>
 						<!-- <view class="flex justify-end" v-if="tabCur === 4">
 							<button class="cu-btn bg-main-color margin-right-sm shadow-blur">评价</button>
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index 28c5374..0640467 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -32,13 +32,15 @@
 					<text class="text-sl text-price">{{curProductSpecs.discountPrice}}</text>
 					<text class="text-del">
 						<text class="text-xxl">¥{{curProductSpecs.goodsPrice}}</text>
-					</text>
+					</text>
+					<text class="margin-left-xs text-xxl">/{{curProductSpecs.goodsUnit}}</text>
 				</view>
 				<view v-else>
 					<text class="text-sl text-price">{{curProductSpecs.goodsPrice}}</text>
+					<text class="margin-left-xs text-xxl">/{{curProductSpecs.goodsUnit}}</text>
 				</view>
 				<view>
-					<!-- <text class="text-df">已售：{{curProductSpecs.saledCount}}</text> -->
+					<text class="text-df">已售：{{curProductSpecs.saleNum}}</text>
 				</view>
 			</view>
 			<view id="pageAnchor0" class="flex justify-between align-end">
@@ -66,7 +68,7 @@
 						</view>
 						{{productDetail.goodsName}}
 					</view>
-					<view class="text-sm text-gray margin-top-xs">{{productDetail.remark}}</view>
+					<view class="text-sm text-gray margin-top-xs">{{productDetail.goodsDesc}}</view>
 				</view>
 				<view class="text-xl text-right padding-lr">
 					<!-- <view class="margin-tb-xs"><text class="cuIcon-share"></text></view> -->
diff --git a/pages/product/product-pick.vue b/pages/product/product-pick.vue
index b502c23..4b08df2 100644
--- a/pages/product/product-pick.vue
+++ b/pages/product/product-pick.vue
@@ -6,9 +6,10 @@
 					<view class="cu-avatar xl" :style="'background-image:url(' + productInfo.goodsImgUrl + ');'">
 					</view>
 					<view class="content margin-left">
-						<text class="text-price text-red text-xxl">{{curSpec.goodsPrice}}</text>
+						<text class="text-price text-red text-xxl">{{curSpec.goodsPrice}}</text>
+						<text class="margin-left-xs">/{{curSpec.goodsUnit}}</text>
 						<text class="text-gray text-sm flex justify-between">
-							{{productInfo.remark}}
+							{{productInfo.goodsDesc}}
 						</text>
 					</view>
 				</view>
@@ -81,8 +82,7 @@
 		},
 		methods: {
 			loadData() {
-				this.curSpec = this.specsList[0];
-				console.log(this.curSpec)
+				this.curSpec = this.specsList[0];
 				this.specsList.forEach(function(item) {
 					this.pickList.push({
 						price: item.goodsPrice,