页面修改

components/logistiComptent/logistiCard/logistiBriefCard.vue

@@ -7,7 +7,7 @@
 				<u-icon name="arrow-right" color="black" size="20"></u-icon>
 			</view>
 		</view>
-		<view class="content" @click="callFn(goodsInfo.shop_phone)">
+		<view class="content" @click.stop="goDetil(goodsInfo.id)">
 			<view v-if="goodsInfo.status==0">
 				<view class="address">店主姓名:&nbsp;&nbsp;{{goodsInfo.shop_user}}</view>
 				<view @click.stop="callFn(goodsInfo.shop_phone)" class="address">

pages/logistics/deliveryDetil.vue

@@ -43,6 +43,9 @@
 							<view>
 								店铺地址:&nbsp;&nbsp;{{goodsDetil.logistics.shop_address}}
 							</view>
+							<view style="margin-top: 10px;">
+								订单备注:&nbsp;&nbsp;{{goodsDetil.logistics.mark}}
+							</view>
 						</view>
 
 						<view class="mark">
@@ -73,7 +76,8 @@
 											width="100rpx" height="100rpx" @click="click"></u--image>
 										<text style="flex: 6;">{{item.goods_name}}</text>
 
-										<text style="flex: 1;">X{{item.product_num}}{{item.goods_unit}}</text>
+										<!-- <text style="flex: 1;">X{{item.product_num}}{{item.goods_unit}}</text> -->
+										<text style="flex: 1;">X{{item.product_num}}</text>
 									</view>
 								</view>
 							</view>
@@ -335,7 +339,6 @@
 					uni.scanCode({
 						onlyFromCamera: true,
 						success: function(res) {
-
 							that.takeGood(res.result)
 						}
 					});
@@ -355,7 +358,7 @@
 						}, 1000)
 					}).catch(err => {
 						Toast(err.msg)
-						console.log(err, 65656)
+						// console.log(err, 65656)
 
 					})
 

subpkg/shareCapital/shareCapital.vue

@@ -1,11 +1,11 @@
 <template>
 	<view style="padding-bottom: 160rpx;">
-		<view class="price_card">
+		<!-- <view class="price_card">
 			<view>账户入股金额</view>
 			<view><text class="money">{{shareholder.shareholder_money}}</text>元</view>
-		</view>
+		</view> -->
-		<view v-if="!shareholder.is_village" style="text-align: center;color: #aaa;">暂无直属上级公司</view>
+		<!-- <view v-if="!shareholder.is_village" style="text-align: center;color: #aaa;">暂无直属上级公司</view> -->
-		<view class="card" v-else-if="shareholder.is_contract">
+		<!-- <view class="card" v-else-if="shareholder.is_contract">
 			<view class="contract">
 				<view class="left">
 					<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
@@ -22,7 +22,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="need_contract" v-else>
+		 -->
+
+
+		<!-- <view class="need_contract" v-else>
 			<button v-if="shareholder.check_status==0" class="btns"
 				style="width: 694rpx;height: 90rpx; margin: 0 auto;border-radius: 54rpx;overflow: hidden;background-color: #0122c7;color: #fff;"
 				@click="clickContract(1)">
@@ -44,7 +47,6 @@
 						</view>
 					</view>
 					<view class="right" @click="navToContract(shareholder.contract_url)">
-						<!-- <image class="icon"></image> -->
 						<uni-icons type="paperclip" color="#3274F9"></uni-icons>
 						<view>查看</view>
 					</view>
@@ -66,7 +68,6 @@
 						</view>
 					</view>
 					<view class="right" @click="navToContract(shareholder.contract_url)">
-						<!-- <image class="icon"></image> -->
 						<uni-icons type="paperclip" color="#3274F9"></uni-icons>
 						<view>查看</view>
 					</view>
@@ -77,7 +78,12 @@
 					<button class="send_btn tips_center" v-else>{{cTimerCount+'秒后可继续再次发送短信'}}</button>
 				</view>
 			</view>
-		</view>
+		</view> -->
+
+
+
+
+
 		<view class="card">
 			<view class="c_title">账单记录</view>
 			<u-line></u-line>
@@ -108,14 +114,14 @@
         </view>
       </view>
     </view> -->
-		<view class="button">
+		<!-- <view class="button">
 			<view class="retreat" @click="retreat">退股</view>
 			<view class="hand" :class="{'disable': !shareholder.is_done_task || !shareholder.is_contract }"
 				@click="hand">上交</view>
-		</view>
+		</view> -->
-		<u-modal :show="modelShow" title="提醒" :content="modelType==1?'确定要生成合同吗':'请确认合同无误后再发送'" closeOnClickOverlay
+		<!-- <u-modal :show="modelShow" title="提醒" :content="modelType==1?'确定要生成合同吗':'请确认合同无误后再发送'" closeOnClickOverlay
 			showCancelButton cancel-text="取消" confirm-text="确认" close="modelShow=false" @cancel="modelShow=false"
-			@confirm="modelType==1?createContract():addContract();modelShow=false"></u-modal>
+			@confirm="modelType==1?createContract():addContract();modelShow=false"></u-modal> -->
 	</view>
 </template>