From ebfd434d26f8269e225efe71ed9c80e2d4cf0ae9 Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Tue, 24 Mar 2020 11:53:04 +0800
Subject: [PATCH] 细节修改
---
SunshineIns/src/fetch/_fetch.js | 9 ++++++---
SunshineIns/src/fetch/entryFind.js | 2 +-
SunshineIns/src/page/ActiveManageEdit.jsx | 3 ++-
SunshineLnsMinApp/templeteDist/wuxDist/spin/index.js | 1 +
SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxml | 14 ++++++++++++++
SunshineIns/src/page/KeyWord.jsx | 6 +++---
SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxss | 1 +
SunshineLnsMinApp/templeteDist/wuxDist/spin/index.json | 6 ++++++
8 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/SunshineIns/src/fetch/_fetch.js b/SunshineIns/src/fetch/_fetch.js
index ad67ecd..774364c 100644
--- a/SunshineIns/src/fetch/_fetch.js
+++ b/SunshineIns/src/fetch/_fetch.js
@@ -2,12 +2,15 @@
// export const base = 'http://xnwj.gznsjc.gov.cn';
// export const base = 'http://nsjc.vaiwan.com';
-export const base = 'http://nsjcy.hugeinfo.com.cn';
+//export const base = 'http://nsjcy.hugeinfo.com.cn';
// export const base = 'http://1p885086k1.iok.la';
-// export const base = 'http://192.168.0.147:8081';
+ export const base = 'http://localhost:6060';
export const domain = base + '/nsjc-charge/';
-export default fetch(domain);
\ No newline at end of file
+export default fetch(domain);
+
+
+
diff --git a/SunshineIns/src/fetch/entryFind.js b/SunshineIns/src/fetch/entryFind.js
index e8c7a60..fda3618 100644
--- a/SunshineIns/src/fetch/entryFind.js
+++ b/SunshineIns/src/fetch/entryFind.js
@@ -1,6 +1,6 @@
import fetch from './_fetch';
import { message } from 'antd';
-export default (id) => fetch(`api/entry/find/?id=${id}`)
+export default (id) => fetch(`api/entry/find/?id=${id}&flag=PC`)
.catch(
error => message.error('详情加载失败，请联系管理员', 2)
);
diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index 4e68068..00ccef8 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -720,7 +720,7 @@
<Divider orientation="left" style={{ margin: '20px', width: '97%' }}>培训结果</Divider>
<div style={divStyle}>
<Row type="flex" align='top' justify="space-around">
- <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>添加结果图片</span></Col>
+ <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>结果材料</span></Col>
<Col span={18} push={0} >
<Upload disabled={disabled} listType="picture-card" onPreview={this.handlePreview} {...bottmProps}>
@@ -731,6 +731,7 @@
</Col>
</Row>
</div>
+
</div> : null) : null
}
diff --git a/SunshineIns/src/page/KeyWord.jsx b/SunshineIns/src/page/KeyWord.jsx
index 780c1b0..3bc2e3e 100644
--- a/SunshineIns/src/page/KeyWord.jsx
+++ b/SunshineIns/src/page/KeyWord.jsx
@@ -160,9 +160,9 @@
}
render() {
const columns = [{
- title: '序号',
- dataIndex: 'index',
- key: 'index'
+ title: '编号',
+ dataIndex: 'id',
+ key: 'id'
}, {
title: '关键词',
dataIndex: 'keywords',
diff --git a/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.js b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.js
new file mode 100644
index 0000000..6f08e76
--- /dev/null
+++ b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.js
@@ -0,0 +1 @@
+"use strict";var _baseComponent=_interopRequireDefault(require("../helpers/baseComponent")),_classNames3=_interopRequireDefault(require("../helpers/classNames"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}(0,_baseComponent.default)({properties:{prefixCls:{type:String,value:"wux-spin"},classNames:{type:null,value:"wux-animate--fadeIn"},tip:{type:String,value:""},size:{type:String,value:"default"},spinning:{type:Boolean,value:!0,observer:"updated"},nested:{type:Boolean,value:!1}},data:{spinVisible:!0},computed:{classes:["prefixCls, size, nested, tip, spinVisible",function(e,t,n,a,i){var s;return{wrap:(0,_classNames3.default)(e,(_defineProperty(s={},"".concat(e,"--").concat(t),t),_defineProperty(s,"".concat(e,"--nested"),n),_defineProperty(s,"".concat(e,"--show-text"),a),s)),anim:"".concat(e,n?"__spinning--nested":"__spinning"),dots:"".concat(e,"__dots"),dot:"".concat(e,"__dot"),tip:"".concat(e,"__tip"),container:(0,_classNames3.default)("".concat(e,"__container"),_defineProperty({},"".concat(e,"__container--blur"),i))}}]},methods:{updated:function(e){this.data.nested&&this.setData({spinVisible:e})}}});
\ No newline at end of file
diff --git a/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.json b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.json
new file mode 100644
index 0000000..9b9e7ab
--- /dev/null
+++ b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.json
@@ -0,0 +1,6 @@
+{
+ "component": true,
+ "usingComponents": {
+ "wux-animation-group": "../animation-group/index"
+ }
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxml b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxml
new file mode 100644
index 0000000..406f9a0
--- /dev/null
+++ b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxml
@@ -0,0 +1,14 @@
+<view class="wux-class {{ classes.wrap }}">
+ <wux-animation-group wux-class="{{ classes.anim }}" in="{{ spinVisible }}" classNames="{{ classNames }}">
+ <view class="{{ classes.dots }}">
+ <view class="{{ classes.dot }}">dot</view>
+ <view class="{{ classes.dot }}">dot</view>
+ <view class="{{ classes.dot }}">dot</view>
+ <view class="{{ classes.dot }}">dot</view>
+ </view>
+ <view class="{{ classes.tip }}" wx:if="{{ tip }}">{{ tip }}</view>
+ </wux-animation-group>
+ <view class="{{ classes.container }}" wx:if="{{ nested }}">
+ <slot></slot>
+ </view>
+</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxss b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxss
new file mode 100644
index 0000000..333bb73
--- /dev/null
+++ b/SunshineLnsMinApp/templeteDist/wuxDist/spin/index.wxss
@@ -0,0 +1 @@
+.wux-spin{position:relative;display:inline-block}.wux-spin__spinning{opacity:1;position:static;display:inline-block;vertical-align:middle;text-align:center;font-size:28rpx;line-height:1.5;color:#108ee9}.wux-spin__spinning--nested{vertical-align:middle;text-align:center;font-size:28rpx;line-height:1.5;color:#108ee9;display:block;position:absolute;height:100%;max-height:640rpx;width:100%;z-index:4}.wux-spin--nested{display:block}.wux-spin--nested .wux-spin__tip{position:absolute;top:50%;width:100%;padding-top:12rpx;text-shadow:0 2rpx 4rpx #fff}.wux-spin__dots{width:40rpx;height:40rpx;overflow:hidden;display:inline-block;transform:rotate(45deg);animation:rotate 1.2s infinite linear}.wux-spin--nested .wux-spin__dots{position:absolute;top:50%;left:50%;margin:-20rpx}.wux-spin__dot{width:18rpx;height:18rpx;border-radius:100%;background-color:#108ee9;transform:scale(.75);display:block;position:absolute;opacity:.3;animation:spinMove 1s infinite linear alternate;transform-origin:50% 50%;text-indent:-999em}.wux-spin__dot:first-child{left:0;top:0}.wux-spin__dot:nth-child(2){right:0;top:0;animation-delay:.4s}.wux-spin__dot:nth-child(3){right:0;bottom:0;animation-delay:.8s}.wux-spin__dot:nth-child(4){left:0;bottom:0;animation-delay:1.2s}.wux-spin--show-text.wux-spin--nested .wux-spin__dots{margin-top:-40rpx}.wux-spin__container{position:relative;transition:opacity .3s;zoom:1}.wux-spin__container--blur{overflow:hidden;opacity:.5;filter:blur(1rpx);transform:translateZ(0)}.wux-spin--small .wux-spin__tip{padding-top:6rpx}.wux-spin--small .wux-spin__dots{width:28rpx;height:28rpx}.wux-spin--small.wux-spin--nested .wux-spin__dots{margin:-14rpx}.wux-spin--small .wux-spin__dot{width:12rpx;height:12rpx}.wux-spin--small.wux-spin--show-text.wux-spin--nested .wux-spin__dots{margin-top:-34rpx}.wux-spin--large .wux-spin__tip{padding-top:24rpx}.wux-spin--large .wux-spin__dots{width:64rpx;height:64rpx}.wux-spin--large.wux-spin--nested .wux-spin__dots{margin:-32rpx}.wux-spin--large .wux-spin__dot{width:28rpx;height:28rpx}.wux-spin--large.wux-spin--show-text.wux-spin--nested .wux-spin__dots{margin-top:-52rpx}@keyframes rotate{to{transform:rotate(405deg)}}@keyframes spinMove{to{opacity:1}}
\ No newline at end of file
--
Gitblit v1.8.0