From b1da35a040dc79240da248775e7249d88539a3ac Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 27 Jun 2023 22:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=91=201.=20=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                     |  26 -------
 api/promotion/article.js       |   9 +++
 components/shareInfo/index.vue |  12 +--
 pages/news_details/index.vue   | 133 +++++++++++++++++----------------
 4 files changed, 83 insertions(+), 97 deletions(-)

diff --git a/api/api.js b/api/api.js
index 26432320..d1fdc19a 100644
--- a/api/api.js
+++ b/api/api.js
@@ -47,32 +47,6 @@ export function getCoupons(data){
   return request.get('coupons',data,{noAuth:true})
 }
 
-/**
- * 我的优惠券
- * @param int types 0全部  1未使用 2已使用
-*/
-export function getUserCoupons(data){
-  return request.get('coupon/list',data)
-}
-
-/**
- * 文章列表
- * @param int cid
- *
-*/
-export function getArticleList(cid,data){
-  return request.get('article/list/' + cid, data,{noAuth:true})
-}
-
-/**
- * 文章详情
- * @param int id
- *
-*/
-export function getArticleDetails(id){
-  return request.get('article/info',id,{noAuth:true});
-}
-
 /**
  * 手机号+验证码登录接口
  * @param object data
diff --git a/api/promotion/article.js b/api/promotion/article.js
index fb43d44b..85d89193 100644
--- a/api/promotion/article.js
+++ b/api/promotion/article.js
@@ -20,3 +20,12 @@ export function getArticlePage(data) {
     noAuth: true // TODO 芋艿：后续要做调整
   });
 }
+
+// 获得文章
+export function getArticle(id) {
+  return request.get("app-api/promotion/article/get", {
+    id
+  }, {
+    noAuth: true // TODO 芋艿：后续要做调整
+  });
+}
diff --git a/components/shareInfo/index.vue b/components/shareInfo/index.vue
index 646f1324..24fa817e 100644
--- a/components/shareInfo/index.vue
+++ b/components/shareInfo/index.vue
@@ -1,19 +1,17 @@
 <template>
 	<view v-if="shareInfoStatus" class="poster-first">
 	    <view class="mask-share">
-			<image src="/static/images/share-info.png" @click="shareInfoClose" @touchmove.stop.prevent="false"></image>
+			<image src="/static/images/share-info.png" @click="shareInfoClose" @touchmove.stop.prevent="false" />
 	    </view>
 	  </view>
 </template>
-
 <script>
-	
 export default {
 	props: {
 		 shareInfoStatus: {
-		      type: Boolean,
-		      default:false,
-		    }
+        type: Boolean,
+        default:false,
+      }
 	},
   data: function() {
     return {};
@@ -25,9 +23,7 @@ export default {
     }
   }
 };
-
 </script>
-
 <style scoped lang="scss">
 	.poster-first {
 	  overscroll-behavior: contain;
diff --git a/pages/news_details/index.vue b/pages/news_details/index.vue
index 7e69f6a0..b653b256 100644
--- a/pages/news_details/index.vue
+++ b/pages/news_details/index.vue
@@ -1,32 +1,34 @@
 <template>
 	<view>
 		<view class='newsDetail'>
-			<view class='title'>{{articleInfo.title}}</view>
+			<view class='title'>{{ articleInfo.title }}</view>
 			<view class='list acea-row row-middle'>
-				<view class='label'>{{articleInfo.author}}</view>
-				<view class='item'>{{articleInfo.createTime}}</view>
-				<view class='item'><text class='iconfont icon-liulan'></text>{{articleInfo.visit}}</view>
+				<view class='label'>{{ articleInfo.author }}</view>
+				<view class='item'>{{ formatDate(articleInfo.createTime) }}</view>
+				<view class='item'><text class='iconfont icon-liulan'></text>{{ articleInfo.browseCount }}</view>
 			</view>
 			<view class='conters'>
-				<jyf-parser :html="content" ref="article" :tag-style="tagStyle"></jyf-parser>
+				<jyf-parser :html="content" ref="article" :tag-style="tagStyle" />
 			</view>
 			<view class="picTxt acea-row row-between-wrapper" v-if="store_info.id">
 				<view class="pictrue">
-					<image :src="store_info.image"></image>
+					<image :src="store_info.picUrl" />
 				</view>
 				<view class="text">
-					<view class="name line1">{{store_info.storeName}}</view>
+					<view class="name line1">{{ store_info.storeName }}</view>
 					<view class="money font-color">
-						￥<text class="num">{{store_info.price}}</text>
+						￥<text class="num">{{ fen2yuan(store_info.price) }}</text>
 					</view>
-					<view class="y_money">￥{{store_info.otPrice}}</view>
+					<view class="y_money">￥{{ fen2yuan(store_info.marketPrice) }}</view>
 				</view>
-				<navigator :url="'/pages/goods_details/index?id='+store_info.id" hover-class="none" class="label">
+				<navigator :url="'/pages/goods_details/index?id=' + store_info.id" hover-class="none" class="label">
           <text class="span">查看商品</text>
         </navigator>
 			</view>
 			<!-- #ifdef H5 -->
-			<button class="bnt bg-color" hover-class='none' @click="listenerActionSheet" v-if="this.$wechat.isWeixin()">和好友一起分享</button>
+			<button class="bnt bg-color" hover-class='none' @click="listenerActionSheet" v-if="this.$wechat.isWeixin()">
+        和好友一起分享
+      </button>
 			<!-- #endif -->
 			<!-- #ifdef MP -->
 			<button class="bnt bg-color" open-type="share" hover-class='none'>和好友一起分享</button>
@@ -36,18 +38,15 @@
 		<home></home>
 	</view>
 </template>
-
 <script>
-	import {
-		getArticleDetails
-	} from '@/api/api.js';
-	import {
-		getProductDetail
-	} from '@/api/store.js';
 	import shareInfo from '@/components/shareInfo';
 	import home from '@/components/home';
 	import parser from "@/components/jyf-parser/jyf-parser";
-	export default {
+  import * as ArticleApi from '@/api/promotion/article.js';
+  import * as ProductSpuApi from '@/api/product/spu.js';
+  import dayjs from "@/plugin/dayjs/dayjs.min.js";
+  import * as Util from '@/utils/util.js';
+  export default {
 		components: {
 			shareInfo,
 			home,
@@ -59,12 +58,12 @@
 				articleInfo: [],
 				store_info: {},
 				content:'',
-				shareInfoStatus:false,
 				tagStyle: {
 					img: 'width:100%;'
 				},
-				productId: 0
-			};
+				productId: 0,
+        shareInfoStatus: false,
+      };
 		},
     /**
      * 生命周期函数--监听页面加载
@@ -98,50 +97,58 @@
     },
     // #endif
 		methods: {
-      getArticleOne:function(){
-			    let that = this;
-			    getArticleDetails({id:that.id}).then(res=>{
-					uni.setNavigationBarTitle({
-					   title:res.data.title.substring(0,7) + "..."
-					});
-					that.$set(that,'articleInfo',res.data);
-					that.$set(that,'productId',res.data.productId);
-					if(res.data.productId){
-						that.goodInfo(res.data.productId);
-					}
-					that.content = res.data.content;
-					// #ifdef H5
-					if (this.$wechat.isWeixin()) {
-						this.setShareInfo();
-					}
-					// #endif
-			    });
-			  },
-			  goodInfo(id){
-				  getProductDetail(id).then(res=>{
-					  this.$set(this,'store_info',res.data.storeInfo?res.data.storeInfo:{});
-				  })
-			  },
-			  listenerActionSheet(){
-				  this.shareInfoStatus = true
-			  },
-			  setShareInfoStatus(){
-				  this.shareInfoStatus = false
-			  },
-			  setShareInfo: function() {
-			  	let href = location.href;
-			  	let configAppMessage = {
-			  		desc: this.articleInfo.synopsis,
-			  		title: this.articleInfo.title,
-			  		link: href,
-			  		imgUrl: this.articleInfo.imageInput.length ? this.articleInfo.imageInput[0] : ""
-			  	};
-			  	this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], configAppMessage);
-			  }
+      getArticleOne: function() {
+        ArticleApi.getArticle(this.id).then(res => {
+          uni.setNavigationBarTitle({
+             title: res.data.title.substring(0,7) + "..."
+          });
+          this.$set(this, 'articleInfo', res.data);
+          this.$set(this, 'productId', res.data.productId);
+          if (res.data.spuId) {
+            this.goodInfo(res.data.spuId);
+          }
+          this.content = res.data.description;
+          // #ifdef H5
+          if (this.$wechat.isWeixin()) {
+            this.setShareInfo();
+          }
+          // #endif
+        });
+      },
+      goodInfo(id) {
+        ProductSpuApi.getSpuDetail(id).then(res=>{
+          this.$set(this, 'store_info', res.data);
+        })
+      },
+      listenerActionSheet() {
+        this.shareInfoStatus = true
+      },
+      setShareInfoStatus() {
+        this.shareInfoStatus = false
+      },
+      setShareInfo: function() {
+        let href = location.href;
+        let configAppMessage = {
+          title: this.articleInfo.title,
+          desc: this.articleInfo.introduction,
+          link: href,
+          imgUrl: this.articleInfo.picUrl
+        };
+        this.$wechat.wechatEvevt([
+          "updateAppMessageShareData",
+          "updateTimelineShareData"
+        ], configAppMessage);
+      },
+
+      fen2yuan(price) {
+        return Util.fen2yuan(price)
+      },
+      formatDate: function(date) {
+        return dayjs(date).format("YYYY-MM-DD");
+      }
 		}
 	}
 </script>
-
 <style lang="scss" scoped>
 	page {
 		background-color: #fff !important;