Merge branch 'master' into zyj

packageIntegral/productList/index.vue

@@ -24,7 +24,7 @@
 				<view class="introduce">
 					<image :src="item.url"></image>
 					<view>{{item.productName}}</view>
-					<view>规格：默认</view>
+					<view>规格：{{ item.attributesTypeName }}</view>
 					<view>库存：{{item.totalStock}}</view>
 				</view>
 				<view class="examine" @click="examineDetail(item)"
@@ -215,7 +215,7 @@
 			productByPage() {
 				serve.productByPage(this.paramter).then(res => {
 					if (res.code === 20000) {
-						if (!res.data.list.length&&this.paramter.currentPage!=1) {
+						if (!res.data.list.length && this.paramter.currentPage != 1) {
 							uni.showToast({
 								title: '没有更多订单啦~',
 								icon: 'none'
@@ -245,8 +245,10 @@
 				this.$refs.delete.open('center')
 				this.deleteData = item
 			},
-			deleteIntegral(){
-				serve.deleteProductById({id:this.deleteData.id}).then(res=>{
+			deleteIntegral() {
+				serve.deleteProductById({
+					id: this.deleteData.id
+				}).then(res => {
 					uni.showToast({
 						title: res.msg,
 						icon: 'none'

packageOrders/pages/orderList/orderList.vue

@@ -46,7 +46,7 @@
 				</view>
 			</scroll-view>
 		</view> -->
-		<view v-if="exportShow==true">
+		<view v-if="exportShow">
 			<view style="padding: 30upx;"></view>
 		<view style="position: fixed;width: 750upx;z-index: 5;text-align: right;top:315upx;right: 30upx;">
 			<button  class="cu-btn bg-white" @click="orderExport">订单导出</button>
@@ -222,7 +222,8 @@
 				'1689183144276463616',
 				'1689183774927818752',
 				'1689184331812888576',
-				'1689185023261741056'
+				'1689185023261741056',
+				'1782596400854310912'
 				]
 				var exportFields = exportList.filter((item) => {
 					return item == uni.getStorageSync('oilSitePriceId');

pages/login/boforeLogin/boforeLogin.vue

@@ -23,9 +23,10 @@
 
 		</view>
 		<view class="margin text-center">
-			<button v-if="checked" class="cu-btn round  bg-main-oil  lg text-lg" open-type="getPhoneNumber"
+			<!-- <text class="cuIcon-weixin padding-right-xs"> </text> -->
+	<!-- 		<button v-if="checked" class="cu-btn round  bg-main-oil  lg text-lg" open-type="getPhoneNumber"
 				@getphonenumber="decryptPhoneNumber">
-				<!-- <text class="cuIcon-weixin padding-right-xs"> </text> -->
+				
 				<text>
 					手机号快捷登录
 				</text>
@@ -34,7 +35,7 @@
 				<text>
 					手机号快捷登录
 				</text>
-			</button>
+			</button> -->
 			<!-- <button class="cu-btn round  btnSize" open-type="getPhoneNumber"
 				@getphonenumber="decryptPhoneNumber">
 				<text class="cuIcon-weixin  text-green lg"></text>