vor 3 Jahren · 19e021cdae
--- a/api/art.js
+++ b/api/art.js
@@ -32,6 +32,14 @@ export function getArtDetail(data,id) {
 
				 		method: 'get',
			
 
				 		data
			
 
				 	});
			
 
				+}

			
 
				+

			
 
				+export function getnoArtDetail(data,id) {

			
 
				+	return request({

			
 
				+		url: '/api/article/detailss/' + id,

			
 
				+		method: 'get',

			
 
				+		data

			
 
				+	});

			
 
				 }
			
 
				 
			
 
				 // 企业赋能分类、企业类型
			
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 
				 {
			
 
				     "name" : "台州互联融媒体",
			
 
				-    "appid" : "__UNI__EEC3739",
			
 
				+    "appid" : "__UNI__9D56835",
			
 
				     "description" : "",
			
 
				     "versionName" : "1.0.7",
			
 
				     "versionCode" : 107,
			
--- a/pages/user/article.vue
+++ b/pages/user/article.vue
@@ -3,7 +3,7 @@
 
				 		<view class="text-box">
			
 
				 			<view class="text-title">
			
 
				 				<view class="text-1">{{artData.title}}</view>
			
 
				-				<view class="text-2">
			
 
				+				<view class="text-2" v-if="artData.mer && artData.mer.name">
			
 
				 					<view class="name clamp">
			
 
				 						{{artData.mer.name}}
			
 
				 					</view>
			
@@ -17,14 +17,14 @@
 
				 					</view>
			
 
				 				</view>
			
 
				 			</view>
			
 
				-			<view class="text-content-title" @click="navTo('/pages/user/dydetail?id=' + artData.mer.id)">
			
 
				+			<view class="text-content-title" @click="navTo('/pages/user/dydetail?id=' + artData.mer.id)" v-if="artData.mer">
			
 
				 				<view class="title-left-box">
			
 
				-					<view class="image">
			
 
				+					<view class="image" >
			
 
				 						<image :src="artData.mer.headimg" mode=""></image>
			
 
				 					</view>
			
 
				 					<view class="title-left-box-content">
			
 
				 						<view class="title-left-box-name">
			
 
				-							<view class="name-title">
			
 
				+							<view class="name-title" v-if="artData.mer && artData.mer.name">
			
 
				 								{{artData.mer.name}}
			
 
				 							</view>
			
 
				 							<view class="name-dingyue" v-if="artData.mer.is_sub==1">
			
@@ -127,7 +127,10 @@
 
				 	</view>
			
 
				 </template>
			
 
				 
			
 
				-<script>
			
 
				+<script>

			
 
				+	import {

			
 
				+		mapState

			
 
				+	} from 'vuex';
			
 
				 	import {
			
 
				 		weixindata,
			
 
				 		shareLoad
			
@@ -137,7 +140,8 @@
 
				 		getPlList,
			
 
				 		getXgList,
			
 
				 		dianZan,
			
 
				-		subPl
			
 
				+		subPl,

			
 
				+		getnoArtDetail
			
 
				 	} from '@/api/art.js'
			
 
				 	import {
			
 
				 		getTime
			
@@ -158,13 +162,22 @@
 
				 		},
			
 
				 		filters: {
			
 
				 			getTime
			
 
				+		},

			
 
				+		computed: {

			
 
				+			...mapState('user', ['hasLogin', 'userInfo']),

			
 
				 		},
			
 
				 		onLoad(opt) {
			
 
				 			if (opt.id) {
			
 
				 				this.artId = opt.id
			
 
				+			}

			
 
				+			if(this.hasLogin) {

			
 
				+				this.getArtDetail()

			
 
				+				this.getPlList()

			
 
				+			}else {

			
 
				+				this.getPlList()

			
 
				+				this.getnoArtDetail()

			
 
				 			}
			
 
				-			this.getArtDetail()
			
 
				-			this.getPlList()
			
 
				+			
			
 
				 		},
			
 
				 		methods: {
			
 
				 			// 分享
			
@@ -204,11 +217,23 @@
 
				 					if (obj.artData.content != null) {
			
 
				 						obj.artData.content = obj.artData.content.replace(/<img/g,
			
 
				 							"<img style='max-width:100%;height:auto;'");
			
 
				-						// obj.artData.content = obj.artData.content.replace(/<p style="text-indent:28px/g," <p style='text-indent:28px;text-align: justify;");
			
 
				 					} //小程序商品详情图超出屏幕问题
			
 
				 					this.getXgList(res.data.cid)
			
 
				 					this.IndexShare()
			
 
				 				})
			
 
				+			},

			
 
				+			//

			
 
				+			getnoArtDetail() {

			
 
				+				let obj = this

			
 
				+				getnoArtDetail({},obj.artId).then(res => {

			
 
				+					obj.artData = res.data

			
 
				+					if (obj.artData.content != null) {

			
 
				+						obj.artData.content = obj.artData.content.replace(/<img/g,

			
 
				+							"<img style='max-width:100%;height:auto;'");

			
 
				+					} //小程序商品详情图超出屏幕问题

			
 
				+					this.getXgList(res.data.cid)

			
 
				+					this.IndexShare()

			
 
				+				})

			
 
				 			},
			
 
				 			getPlList() {
			
 
				 				let obj = this
			
--- a/unpackage/dist/build/h5/2022-9-26.zip
+++ b/unpackage/dist/build/h5/2022-9-26.zip
--- a/unpackage/dist/build/h5/h5.rar
+++ b/unpackage/dist/build/h5/h5.rar
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
 
				 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>台州互联融媒体</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
			
 
				-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.f6b16b58.js></script><script src=/index/static/js/index.d774b5cb.js></script></body></html>
			
 
				+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.be6b9e0a.js></script><script src=/index/static/js/index.f0e662ee.js></script></body></html>
			
--- a/unpackage/dist/build/h5/static/index.b0707a6a.css
+++ b/unpackage/dist/build/h5/static/index.b0707a6a.css
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.be6b9e0a.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.be6b9e0a.js
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.f6b16b58.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.f6b16b58.js
--- a/unpackage/dist/build/h5/static/js/index.d774b5cb.js
+++ b/unpackage/dist/build/h5/static/js/index.d774b5cb.js
--- a/unpackage/dist/build/h5/static/js/index.f0e662ee.js
+++ b/unpackage/dist/build/h5/static/js/index.f0e662ee.js
--- a/unpackage/dist/build/h5/static/js/pages-cart-zmt.79f819a3.js
+++ b/unpackage/dist/build/h5/static/js/pages-cart-zmt.79f819a3.js
--- a/unpackage/dist/build/h5/static/js/pages-cart-zmt.c56d2c97.js
+++ b/unpackage/dist/build/h5/static/js/pages-cart-zmt.c56d2c97.js
--- a/unpackage/dist/build/h5/static/js/pages-category-funeng.8d26727f.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-funeng.8d26727f.js
--- a/unpackage/dist/build/h5/static/js/pages-category-funeng.d4b929be.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-funeng.d4b929be.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.6091fe82.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.6091fe82.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.a38972e5.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.a38972e5.js
--- a/unpackage/dist/build/h5/static/js/pages-index-searchArt.13e583cb.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-searchArt.13e583cb.js
--- a/unpackage/dist/build/h5/static/js/pages-index-searchArt.b0e40b67.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-searchArt.b0e40b67.js
--- a/unpackage/dist/build/h5/static/js/pages-index-searchArt~pages-index-searchZmt~pages-user-dydetail~pages-user-mydy~pages-user-mymsg~pag~68428ed0.a39805a1.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-searchArt~pages-index-searchZmt~pages-user-dydetail~pages-user-mydy~pages-user-mymsg~pag~68428ed0.a39805a1.js
--- a/unpackage/dist/build/h5/static/js/pages-index-searchArt~pages-index-searchZmt~pages-user-dydetail~pages-user-mydy~pages-user-mymsg~pag~68428ed0.fb8e7c54.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-searchArt~pages-index-searchZmt~pages-user-dydetail~pages-user-mydy~pages-user-mymsg~pag~68428ed0.fb8e7c54.js
--- a/unpackage/dist/build/h5/static/js/pages-index-searchZmt.8045a353.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-searchZmt.8045a353.js
--- a/unpackage/dist/build/h5/static/js/pages-index-searchZmt.f899f197.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-searchZmt.f899f197.js
--- a/unpackage/dist/build/h5/static/js/pages-meeting-meeting.a2f42984.js
+++ b/unpackage/dist/build/h5/static/js/pages-meeting-meeting.a2f42984.js
--- a/unpackage/dist/build/h5/static/js/pages-meeting-meeting.cab0b877.js
+++ b/unpackage/dist/build/h5/static/js/pages-meeting-meeting.cab0b877.js
--- a/unpackage/dist/build/h5/static/js/pages-public-forget.2e6dbc1b.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-forget.2e6dbc1b.js
--- a/unpackage/dist/build/h5/static/js/pages-public-forget.c941209b.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-forget.c941209b.js
--- a/unpackage/dist/build/h5/static/js/pages-public-login.23fb5417.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-login.23fb5417.js
--- a/unpackage/dist/build/h5/static/js/pages-public-login.fe31a0fe.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-login.fe31a0fe.js
--- a/unpackage/dist/build/h5/static/js/pages-public-register.457f6957.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-register.457f6957.js
--- a/unpackage/dist/build/h5/static/js/pages-public-register.512cd76a.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-register.512cd76a.js
--- a/unpackage/dist/build/h5/static/js/pages-public-wxLogin.90a078db.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-wxLogin.90a078db.js
--- a/unpackage/dist/build/h5/static/js/pages-public-wxLogin.a4881191.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-wxLogin.a4881191.js
--- a/unpackage/dist/build/h5/static/js/pages-redirect-redirect.3553043d.js
+++ b/unpackage/dist/build/h5/static/js/pages-redirect-redirect.3553043d.js
--- a/unpackage/dist/build/h5/static/js/pages-redirect-redirect.b4c096bd.js
+++ b/unpackage/dist/build/h5/static/js/pages-redirect-redirect.b4c096bd.js
--- a/unpackage/dist/build/h5/static/js/pages-set-bjq.68348bd4.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-bjq.68348bd4.js
@@ -0,0 +1 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-bjq"],{"4f3f":function(t,n,e){"use strict";e.r(n);var a=e("afaf"),i=e.n(a);for(var o in a)"default"!==o&&function(t){e.d(n,t,(function(){return a[t]}))}(o);n["default"]=i.a},"63c1":function(t,n,e){"use strict";e.r(n);var a=e("73a0"),i=e("4f3f");for(var o in i)"default"!==o&&function(t){e.d(n,t,(function(){return i[t]}))}(o);var r,u=e("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"77c0ae40",null,!1,a["a"],r);n["default"]=c.exports},"73a0":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticClass:"content"},[e("jinEdit",{attrs:{placeholder:"请输入企业简介",uploadFileUrl:"/api/upload/image",header:{"Authori-zation":t.AuthoriZation},showImgSize:!0,html:t.content},on:{editOk:function(n){arguments[0]=n=t.$handleEvent(n),t.editOk.apply(void 0,arguments)}}})],1)},o=[]},afaf:function(t,n,e){"use strict";var a=e("4ea4");e("ac1f"),e("5319"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=a(e("5378")),o={components:{jinEdit:i.default},data:function(){return{AuthoriZation:"",content:""}},onLoad:function(){this.content=this.$api.prePage().content,this.AuthoriZation="Bearer "+uni.getStorageSync("token")},methods:{editOk:function(t){var n=this;console.log(t);var e=t.html;console.log(n.$api.prePage().content,"obj.$api.prePage().data"),n.$api.prePage().content=e.replace(/<img/g,"<img style='max-width:100%;height:auto;'"),uni.navigateBack({})}}};n.default=o}}]);
			
--- a/unpackage/dist/build/h5/static/js/pages-set-bjq.d0f55bfc.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-bjq.d0f55bfc.js
@@ -1 +0,0 @@
 
				-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-bjq"],{"18d9":function(t,n,e){"use strict";e.r(n);var a=e("9819"),i=e("a335");for(var o in i)"default"!==o&&function(t){e.d(n,t,(function(){return i[t]}))}(o);var r,u=e("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"501185fc",null,!1,a["a"],r);n["default"]=c.exports},"5d11":function(t,n,e){"use strict";var a=e("4ea4");e("ac1f"),e("5319"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=a(e("9f98")),o={components:{jinEdit:i.default},data:function(){return{AuthoriZation:"",content:""}},onLoad:function(){this.content=this.$api.prePage().content,this.AuthoriZation="Bearer "+uni.getStorageSync("token")},methods:{editOk:function(t){var n=this;console.log(t);var e=t.html;console.log(n.$api.prePage().content,"obj.$api.prePage().data"),n.$api.prePage().content=e.replace(/<img/g,"<img style='max-width:100%;height:auto;'"),uni.navigateBack({})}}};n.default=o},9819:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticClass:"content"},[e("jinEdit",{attrs:{placeholder:"请输入企业简介",uploadFileUrl:"/api/upload/image",header:{"Authori-zation":t.AuthoriZation},showImgSize:!0,html:t.content},on:{editOk:function(n){arguments[0]=n=t.$handleEvent(n),t.editOk.apply(void 0,arguments)}}})],1)},o=[]},a335:function(t,n,e){"use strict";e.r(n);var a=e("5d11"),i=e.n(a);for(var o in a)"default"!==o&&function(t){e.d(n,t,(function(){return a[t]}))}(o);n["default"]=i.a}}]);
			
--- a/unpackage/dist/build/h5/static/js/pages-set-bjq~pages-set-userinfo.33ecb832.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-bjq~pages-set-userinfo.33ecb832.js
--- a/unpackage/dist/build/h5/static/js/pages-set-bjq~pages-set-userinfo.53802236.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-bjq~pages-set-userinfo.53802236.js
--- a/unpackage/dist/build/h5/static/js/pages-set-phone.223f9aae.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-phone.223f9aae.js
--- a/unpackage/dist/build/h5/static/js/pages-set-phone.e61a9c1a.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-phone.e61a9c1a.js
--- a/unpackage/dist/build/h5/static/js/pages-set-set.3d380e9b.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-set.3d380e9b.js
--- a/unpackage/dist/build/h5/static/js/pages-set-set.96c9d471.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-set.96c9d471.js
--- a/unpackage/dist/build/h5/static/js/pages-set-setinfo.8bb620ef.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-setinfo.8bb620ef.js
--- a/unpackage/dist/build/h5/static/js/pages-set-setinfo.e15dabd8.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-setinfo.e15dabd8.js
--- a/unpackage/dist/build/h5/static/js/pages-set-userinfo.7a9b7e0e.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-userinfo.7a9b7e0e.js
--- a/unpackage/dist/build/h5/static/js/pages-set-userinfo.fd845c1a.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-userinfo.fd845c1a.js
--- a/unpackage/dist/build/h5/static/js/pages-user-article.6668f2bf.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-article.6668f2bf.js
--- a/unpackage/dist/build/h5/static/js/pages-user-article.83bbf01c.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-article.83bbf01c.js
--- a/unpackage/dist/build/h5/static/js/pages-user-dydetail.6da7e065.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-dydetail.6da7e065.js
--- a/unpackage/dist/build/h5/static/js/pages-user-dydetail.fed0eeeb.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-dydetail.fed0eeeb.js
--- a/unpackage/dist/build/h5/static/js/pages-user-dyjj.02582a43.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-dyjj.02582a43.js
--- a/unpackage/dist/build/h5/static/js/pages-user-dyjj.a1f36d3b.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-dyjj.a1f36d3b.js
--- a/unpackage/dist/build/h5/static/js/pages-user-joinMedia.909a3b6f.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-joinMedia.909a3b6f.js
--- a/unpackage/dist/build/h5/static/js/pages-user-joinMedia.be472516.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-joinMedia.be472516.js
--- a/unpackage/dist/build/h5/static/js/pages-user-mydy.7132e392.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-mydy.7132e392.js
--- a/unpackage/dist/build/h5/static/js/pages-user-mydy.78cdea51.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-mydy.78cdea51.js
--- a/unpackage/dist/build/h5/static/js/pages-user-mymsg.41e52858.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-mymsg.41e52858.js
--- a/unpackage/dist/build/h5/static/js/pages-user-mymsg.e398afa5.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-mymsg.e398afa5.js
--- a/unpackage/dist/build/h5/static/js/pages-user-mypl.866761ae.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-mypl.866761ae.js
--- a/unpackage/dist/build/h5/static/js/pages-user-mypl.ed9131af.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-mypl.ed9131af.js
--- a/unpackage/dist/build/h5/static/js/pages-user-registerMember.ef39b71e.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-registerMember.ef39b71e.js
--- a/unpackage/dist/build/h5/static/js/pages-user-registerMember.f0565c62.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-registerMember.f0565c62.js
--- a/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.32c3def1.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.32c3def1.js
--- a/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.f9556499.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.f9556499.js
--- a/unpackage/dist/build/h5/static/js/pages-user-team.96e6d8e5.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-team.96e6d8e5.js
--- a/unpackage/dist/build/h5/static/js/pages-user-team.a32f6d0f.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-team.a32f6d0f.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.267a299f.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.267a299f.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.bda726ea.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.bda726ea.js