Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan into main

components/goods-sku-popup/index.vue

@@ -19,8 +19,8 @@
 								<text class="sign">¥</text>
 								<text class="price" :class="priceCom.length > 16 ? 'price2' : ''">{{ priceCom }}</text>
 							</view>
-							<view class="inventory" v-if="!hideStock">{{ stockText }}：{{ stockCom }}</view>
+							<!-- <view class="inventory" v-if="!hideStock">{{ stockText }}：{{ stockCom }}</view> -->
-							<view class="inventory" v-else></view>
+							<view class="inventory"></view>
 							<view class="choose" v-show="isManyCom">
 								<text v-if="!selectArr.every(val => val == '')">已选：{{ selectArr.join(' ') }}</text>
 							</view>
@@ -45,7 +45,7 @@
 						<view class="number-box-view" v-if="!userInfo.user_type || userInfo.user_type != 40">
 							<view style="flex: 1;">数量</view>
 							<view style="flex: 4;text-align: right;">
-								<number-box v-model="selectNum" :min="minBuyNum || 1" :max="maxBuyNumCom"
+								<number-box v-model="selectNum" :min="minBuyNum || 1" max="99999999999"
 									:step="stepBuyNum || 1" :step-strictly="stepStrictly" :positive-integer="true"
 									@change="numChange" />
 							</view>

pages/order/index.vue

@@ -94,7 +94,7 @@
 						<!-- 		<view class="n"
 										v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
 										@click="onAdress(order.goods_id)">修改地址</view> -->
-						<!-- <view class="n n-1" @click="onInvoicing(item.order_id,item)">评价</view> -->
+						<view class="n n-1" @click="onInvoicing(item.order_id,item)">评价</view>
 					</view>
 				</view>
 			</view>