冲突修改

api/goods/index.js

@@ -37,10 +37,10 @@ export const presale = (data) => {
 	return request.get('goods/presale', data)
 }
 
-// 商品浏览记录
-export const presale = (param, option) => {
-  return request.get(api.presale, param, option)
-}
+// // 商品浏览记录
+// export const presale = (param, option) => {
+//   return request.get(api.presale, param, option)
+// }
 // 服务
 export const serveList = (param, option) => {
   return request.get(api.serveList, param, option)

pages/goods/detail.vue

@@ -10,12 +10,8 @@
 		<view class="head">
 			<view class="share">
 				<view class="sp"></view>
-<<<<<<< HEAD
-				<image src="/static/detail/share.png" mode="" class="shareIcon"></image>
 				<button open-type="share"></button>
-=======
 				<image src="/static/detail/share.png" mode="" class="shareIcon" @click="shareImg"></image>
->>>>>>> be56674fc2126fdd597f0cf61678ee009b1a0533
 			</view>
 			<view class="swiper">
 				<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
@@ -67,13 +63,8 @@
 					{{goods.goods_name}}
 				</view>
 				<view class="goodsOpera">
-<<<<<<< HEAD
-					<view class="goodsNum" @click="copyNum">
-						<text>{{goods.goods_id}}</text>
-=======
 					<view class="goodsNum" @click="copyNum" v-if="goods.skuList.length>0">
 						<text>{{goods.skuList[0].goods_sku_id}}</text>
->>>>>>> be56674fc2126fdd597f0cf61678ee009b1a0533
 						<image src="/static/detail/copy.png" mode=""></image>
 					</view>
 					<view class="operaImg">
@@ -101,11 +92,7 @@
 						<image src="../../static/detail/rightIcon.png" mode=""></image>
 					</view>
 					<view class="address">
-<<<<<<< HEAD
-						<!-- {{addressInfo?addressInfo:''}} -->
-=======
 						{{addressInfo.region.province +'-'+addressInfo.region.city+'-'+addressInfo.region.region}}
->>>>>>> be56674fc2126fdd597f0cf61678ee009b1a0533
 					</view>
 				</view>
 			</view>
@@ -331,28 +318,16 @@
 			this.goodsId=options.goodsId;
 		},
 		onShow() {
-<<<<<<< HEAD
 			if(uni.getStorageSync('AccessToken')){
 				this.getAddressList()
 				this.getSuggestGoods()
+				this.getServeList()
 				this.userInfo = uni.getStorageSync('userInfo');
 			}else{
 				this.userInfo = {}
 			}
 			this.getGoodsDetail()
 		},
-		methods: {
-			toDetail (id){
-				uni.navigateTo({
-					url: "/pages/goods/detail?goodsId="+id
-=======
-			this.token = uni.getStorageSync('token')
-			this.getAddressList()
-			this.getSuggestGoods()
-			this.userInfo = uni.getStorageSync('userInfo');
-			this.getServeList()
-
-		},
 		methods: {
 			copyText(val){
 				// 获取要复制的文本内容
@@ -413,7 +388,6 @@
 							}
 						})
 						.catch()
->>>>>>> be56674fc2126fdd597f0cf61678ee009b1a0533
 				})
 			},
 			// 预约成功去列表
@@ -455,21 +429,12 @@
 				const that = this
 				return new Promise((resolve, reject) => {
 					address.defaultId().then(res => {
-<<<<<<< HEAD
-							if (res.code == 200) {
-								if(that.addressList.length>0){
-									for (var i = 0; i < that.addressList.length; i++) {
-										if (res.data.defaultId == that.addressList[i].address_id) {
-											that.addressInfo = that.addressList[i]
-										}
-=======
 							if (res.status == 200) {
 								for (var i = 0; i < that.addressList.length; i++) {
 									if (res.data.defaultId == that.addressList[i].address_id) {
 										that.addressInfo = that.addressList[i];
 										
 										console.log(that.addressInfo,'获取地址')
->>>>>>> be56674fc2126fdd597f0cf61678ee009b1a0533
 									}
 								}
 							}
@@ -1118,13 +1083,8 @@
 					font-size: 28rpx;
 					font-weight: 400;
 					color: #000000;
-<<<<<<< HEAD
 					line-height: 40rpx;
 					display: -webkit-box;
-=======
-					// line-height: 33rpx;
-					// display: -webkit-box;
->>>>>>> be56674fc2126fdd597f0cf61678ee009b1a0533
 					overflow: hidden;
 					text-overflow: ellipsis;
 					white-space: normal !important;