diff --git a/test_mini/app.js b/test_mini/app.js
index 7d4f53a..cedf564 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -54,11 +54,11 @@ App({
})
},
globalData: {
- userInfo: null,
- userinfo: null, // 服务器传回的消费者信息
- // host: 'https://apitest.ctcshe.com',
+ userInfo: {},
+ userinfo: {}, // 服务器传回的消费者信息
+ host: 'https://apitest.ctcshe.com',
mediahost: 'https://apitest.ctcshe.com',
- host: 'http://127.0.0.1:8000',
+ //host: 'http://127.0.0.1:8000',
//mediahost: 'http://127.0.0.1:8000',
token : '',
}
diff --git a/test_mini/pages/article/detail.js b/test_mini/pages/article/detail.js
index 98e8978..a3d3bc1 100644
--- a/test_mini/pages/article/detail.js
+++ b/test_mini/pages/article/detail.js
@@ -6,7 +6,7 @@ Page({
* 页面的初始数据
*/
data: {
-
+ elink_f:''
},
/**
@@ -68,7 +68,16 @@ Page({
getDetail: function (id) {
var that = this
api.request(`/cms/article/${id}/`,'GET').then(res => {
- that.setData(res.data)
+ if(res.data.elink){
+ let elink_f = getApp().globalData.host + '/redirect?url='+res.data.elink
+ console.log(elink_f)
+ that.setData({
+ elink_f:elink_f
+ })
+ }else{
+ that.setData(res.data)
+ }
+
})
},
diff --git a/test_mini/pages/article/detail.wxml b/test_mini/pages/article/detail.wxml
index 1cf9409..52dffbe 100644
--- a/test_mini/pages/article/detail.wxml
+++ b/test_mini/pages/article/detail.wxml
@@ -1,4 +1,4 @@
-
+
{{title}}
diff --git a/test_mini/pages/article/index.json b/test_mini/pages/article/index.json
index 8835af0..b111d8b 100644
--- a/test_mini/pages/article/index.json
+++ b/test_mini/pages/article/index.json
@@ -1,3 +1,5 @@
{
- "usingComponents": {}
+ "usingComponents": {},
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 50
}
\ No newline at end of file
diff --git a/test_server/server/urls.py b/test_server/server/urls.py
index f50b7f3..53dbe33 100644
--- a/test_server/server/urls.py
+++ b/test_server/server/urls.py
@@ -21,7 +21,7 @@ from rest_framework_jwt.views import obtain_jwt_token,refresh_jwt_token,verify_j
from rest_framework.documentation import include_docs_urls
from rbac.views.user import UserLogoutView
from utils.file import UploadFileView
-
+from utils.view import redirect
urlpatterns = [
path('rbac/', include('rbac.urls')),
@@ -35,6 +35,7 @@ urlpatterns = [
path('token/verify/', verify_jwt_token),
path('token/remove/', UserLogoutView.as_view()),
path('uploadfile/', UploadFileView.as_view()),
+ path('redirect/',redirect),
path('admin/', admin.site.urls),
path('docs/', include_docs_urls(title="答题平台接口文档",authentication_classes=[], permission_classes=[])),
]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/test_server/utils/view.py b/test_server/utils/view.py
new file mode 100644
index 0000000..e907727
--- /dev/null
+++ b/test_server/utils/view.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+import requests
+from django.http import HttpResponse
+
+def redirect(request):
+ data = requests.get(url=request.GET.get('url'))
+ return HttpResponse(data.content)