diff --git a/class/main.wxss b/class/main.wxss
index dd8cb4c..30c364f 100644
--- a/class/main.wxss
+++ b/class/main.wxss
@@ -4224,6 +4224,34 @@ l .text-depblack {
padding: 10rpx 0rpx;
}
+.play-box-shadow {
+ display: flex;
+ flex-direction: column;
+ width: 80%;
+ background-color: white;
+ border-radius: 15rpx;
+ align-items: center;
+ justify-content: center;
+ padding: 15rpx;
+ position: relative;
+ margin-bottom: 15rpx;
+ box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.2), 0 6rpx 20rpx 0 rgba(0, 0, 0, 0.19);
+}
+
+.play-box-shadow-little {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ background-color: white;
+ border-radius: 15rpx;
+ align-items: center;
+ justify-content: center;
+ padding: 15rpx;
+ position: relative;
+ margin-bottom: 15rpx;
+ box-shadow: 0 0 4rpx 0 rgba(0, 0, 0, 0.2), 0 0 10rpx 0 rgba(0, 0, 0, 0.04);
+}
+
.page-box {
width: 100%;
padding: 15rpx;
@@ -4279,6 +4307,26 @@ l .text-depblack {
border-radius: 50%;
}
+.play-box-shadow image {
+ width: 60rpx;
+ height: 60rpx;
+}
+
+.play-box-shadow image:active {
+ background-color: rgb(204, 202, 202);
+ border-radius: 50%;
+}
+
+.play-box-shadow-little image {
+ width: 60rpx;
+ height: 60rpx;
+}
+
+.play-box-shadow-little image:active {
+ background-color: rgb(204, 202, 202);
+ border-radius: 50%;
+}
+
.text-left input {
text-align: right;
}
diff --git a/packagecard/cardDetail/cardDetail.wxml b/packagecard/cardDetail/cardDetail.wxml
index 1636389..7998060 100644
--- a/packagecard/cardDetail/cardDetail.wxml
+++ b/packagecard/cardDetail/cardDetail.wxml
@@ -8,8 +8,10 @@
-
{{item.templateAreaFontValue}}
diff --git a/packagecard/cardDetail/cardDetail.wxss b/packagecard/cardDetail/cardDetail.wxss
index 62c44fa..63d1a3c 100644
--- a/packagecard/cardDetail/cardDetail.wxss
+++ b/packagecard/cardDetail/cardDetail.wxss
@@ -207,4 +207,17 @@
text-align: right;
color: #fd9494;
font-size: 24rpx;
+}
+
+
+/* 换行 */
+.wrap-line {
+ white-space: pre-line;
+}
+
+/* 居中 */
+.wrap-center {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
\ No newline at end of file
diff --git a/packagecard/marketing/marketingposter.js b/packagecard/marketing/marketingposter.js
index 9dd1600..959c61f 100644
--- a/packagecard/marketing/marketingposter.js
+++ b/packagecard/marketing/marketingposter.js
@@ -27,7 +27,7 @@ Page({
curTypeId: '',
isShowOptions: false, //是否显示选项
curItemIndex: -1, //点击分享按钮弹出的
-
+ curTypeName: '全部'
},
/**
@@ -56,17 +56,22 @@ Page({
if (res.data.length > 0) {
_self.setData({
optionsList: res.data,
- curTypeId: res.data[0].dataId
})
//根据第一条获取数据
_self.getTempleteList()
}
+ var allItem = {
+ dataName: '全部',
+ dataId: '2'
+ }
var tempItem = {
dataName: '我的收藏',
dataId: '1'
}
+ _self.data.optionsList.unshift(allItem)
_self.data.optionsList.push(tempItem)
_self.setData({
+ curTypeId: res.data[0].dataId,
optionsList: _self.data.optionsList
})
})
@@ -86,9 +91,11 @@ Page({
var _self = this
var id = e.currentTarget.dataset.id
var idx = e.currentTarget.dataset.idx
+ var name = e.currentTarget.dataset.name
_self.setData({
currentTypeIndex: idx,
curTypeId: id,
+ curTypeName:name ,
posterHistoryList: [],
posterTempleteList: [],
isShowOptions: false
@@ -314,7 +321,7 @@ Page({
token: app.globalData.token
},
data: {
- templateType: _self.data.curTypeId
+ templateType: _self.data.curTypeId == '2' ? '' : _self.data.curTypeId
}
})
.then(res => {
@@ -385,7 +392,7 @@ Page({
},
data: {
mode: '2',
- templateType: _self.data.curTypeId
+ templateType: _self.data.curTypeId == '2' ? '' : _self.data.curTypeId
}
})
.then(res => {
diff --git a/packagecard/marketing/marketingposter.wxml b/packagecard/marketing/marketingposter.wxml
index ca71c80..bd0bc7a 100644
--- a/packagecard/marketing/marketingposter.wxml
+++ b/packagecard/marketing/marketingposter.wxml
@@ -11,14 +11,15 @@
-
- 筛选
+
+ {{curTypeName}}
-
+
{{item.dataName}}
diff --git a/packagecard/marketing/marketingpublish.js b/packagecard/marketing/marketingpublish.js
index 15dee6e..0cd6366 100644
--- a/packagecard/marketing/marketingpublish.js
+++ b/packagecard/marketing/marketingpublish.js
@@ -254,5 +254,5 @@ Page({
})
},
-
+
})
\ No newline at end of file
diff --git a/packagecard/marketing/marketingpublish.wxml b/packagecard/marketing/marketingpublish.wxml
index 2e21e57..f1453f2 100644
--- a/packagecard/marketing/marketingpublish.wxml
+++ b/packagecard/marketing/marketingpublish.wxml
@@ -8,8 +8,10 @@
-
{{item.templateAreaFontValue}}
diff --git a/packagecard/marketing/marketingpublish.wxss b/packagecard/marketing/marketingpublish.wxss
index 6985ae5..db93d9f 100644
--- a/packagecard/marketing/marketingpublish.wxss
+++ b/packagecard/marketing/marketingpublish.wxss
@@ -1,210 +1,222 @@
.card {
- width: 100%;
- height: 0;
- position: relative;
- box-sizing: border-box;
- z-index: 100;
- /* text-align: center; */
- }
-
- .card-bgImg {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- }
-
- .area-box {
- white-space: nowrap;
- background: none !important;
- z-index: 111;
- }
-
- .area-box image {
- width: 100%;
- height: 100%;
- }
-
- .card-info {
- padding-bottom: 100rpx;
- width: 100%;
- margin-top: 15rpx;
- }
-
- .card-title {
- font-size: 30rpx;
- background: #ffffff;
- width: 100%;
- padding: 15rpx;
- }
-
- .row {
- display: flex;
- border-bottom: 1px solid #EEE;
- background: #ffffff;
- border-bottom: 1rpx solid #f5f5f5;
- }
-
- .row-ver {
- display: flex;
- border-bottom: 1px solid #EEE;
- border-bottom: 1rpx solid #f5f5f5;
- flex-direction: column;
- background-color: #ffffff;
- padding: 15rpx;
- }
-
- .row-ver:nth-child(1) {
- padding: 15rpx 15rpx 7.5rpx 15rpx;
- }
-
- .row-ver:last-child {
- padding: 7.5rpx 15rpx 15rpx 15rpx;
- }
-
- .item-title {
- flex: 1;
- font-size: 32rpx;
- line-height: 50rpx;
- color: #808080;
- }
-
- .item-title-box {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- align-items: center;
- margin-top: 7.5rpx;
- }
-
- .item-input {
- flex: 4;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- margin-top: 15rpx;
- }
-
- .item-input input {
- width: 100%;
- text-align: left;
- height: 50rpx;
- font-size: 32rpx;
- color: #333;
- }
-
- .item-input image {
- max-width: 70%;
- /* max-height: 120rpx; */
- }
-
- .item-code-input image {
- max-width: 35%;
- max-height: 160rpx;
- }
-
-
-
-
- .hide-link {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- background: rgba(0, 0, 0, 0.6);
- z-index: 1000;
- }
-
- .hide {
- position: absolute;
- top: 50%;
- left: 50%;
- width: 60%;
- transform: translate(-50%, -50%);
- border-radius: 10rpx;
- background: #fff;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- }
-
- .hide-btn {
- display: flex;
- width: 50%;
- height: 60rpx;
- background: #1d7ff0;
- color: #fff;
- font-size: 30rpx;
- justify-content: center;
- align-items: center;
- border-bottom-left-radius: 10rpx;
- border-bottom-right-radius: 10rpx;
- }
-
- .hide-btn:nth-child(1) {
- background: #E6B980;
- border-bottom-left-radius: 10rpx;
- border-bottom-right-radius: 0rpx;
- }
-
- .hide-btn:last-child {
- border-bottom-left-radius: 0rpx;
- border-bottom-right-radius: 10rpx;
- }
-
- .hide-text {
- font-size: 36rpx;
- color: #000;
- padding: 50rpx 30rpx;
- }
-
- .hide-title {
- font-size: 43rpx;
- color: #ffC107;
- padding: 10rpx;
- }
-
- .hide-btn-box {
- display: flex;
- width: 100%;
- justify-content: space-between;
- }
-
- .input-box {
- width: 100%;
- }
-
- .content-box {
- width: 100%;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- padding: 15rpx;
- }
-
- .cuIcon-cameraadd {
- font-size: 60rpx;
- }
-
- .card-img-box {
- display: flex;
- flex-direction: row;
- align-items: center;
- margin-right: 40rpx;
- justify-content: space-between;
- }
-
- .card-img-box image {
- width: 200rpx;
- height: 200rpx;
- }
-
- .hint-txt {
- text-align: right;
- color: #fd9494;
- font-size: 24rpx;
- }
\ No newline at end of file
+ width: 100%;
+ height: 0;
+ position: relative;
+ box-sizing: border-box;
+ z-index: 100;
+ /* text-align: center; */
+}
+
+.card-bgImg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
+
+.area-box {
+ white-space: nowrap;
+ background: none !important;
+ z-index: 111;
+}
+
+.area-box image {
+ width: 100%;
+ height: 100%;
+}
+
+.card-info {
+ padding-bottom: 100rpx;
+ width: 100%;
+ margin-top: 15rpx;
+}
+
+.card-title {
+ font-size: 30rpx;
+ background: #ffffff;
+ width: 100%;
+ padding: 15rpx;
+}
+
+.row {
+ display: flex;
+ border-bottom: 1px solid #EEE;
+ background: #ffffff;
+ border-bottom: 1rpx solid #f5f5f5;
+}
+
+.row-ver {
+ display: flex;
+ border-bottom: 1px solid #EEE;
+ border-bottom: 1rpx solid #f5f5f5;
+ flex-direction: column;
+ background-color: #ffffff;
+ padding: 15rpx;
+}
+
+.row-ver:nth-child(1) {
+ padding: 15rpx 15rpx 7.5rpx 15rpx;
+}
+
+.row-ver:last-child {
+ padding: 7.5rpx 15rpx 15rpx 15rpx;
+}
+
+.item-title {
+ flex: 1;
+ font-size: 32rpx;
+ line-height: 50rpx;
+ color: #808080;
+}
+
+.item-title-box {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 7.5rpx;
+}
+
+.item-input {
+ flex: 4;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ margin-top: 15rpx;
+}
+
+.item-input input {
+ width: 100%;
+ text-align: left;
+ height: 50rpx;
+ font-size: 32rpx;
+ color: #333;
+}
+
+.item-input image {
+ max-width: 70%;
+ /* max-height: 120rpx; */
+}
+
+.item-code-input image {
+ max-width: 35%;
+ max-height: 160rpx;
+}
+
+
+
+
+.hide-link {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background: rgba(0, 0, 0, 0.6);
+ z-index: 1000;
+}
+
+.hide {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 60%;
+ transform: translate(-50%, -50%);
+ border-radius: 10rpx;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+
+.hide-btn {
+ display: flex;
+ width: 50%;
+ height: 60rpx;
+ background: #1d7ff0;
+ color: #fff;
+ font-size: 30rpx;
+ justify-content: center;
+ align-items: center;
+ border-bottom-left-radius: 10rpx;
+ border-bottom-right-radius: 10rpx;
+}
+
+.hide-btn:nth-child(1) {
+ background: #E6B980;
+ border-bottom-left-radius: 10rpx;
+ border-bottom-right-radius: 0rpx;
+}
+
+.hide-btn:last-child {
+ border-bottom-left-radius: 0rpx;
+ border-bottom-right-radius: 10rpx;
+}
+
+.hide-text {
+ font-size: 36rpx;
+ color: #000;
+ padding: 50rpx 30rpx;
+}
+
+.hide-title {
+ font-size: 43rpx;
+ color: #ffC107;
+ padding: 10rpx;
+}
+
+.hide-btn-box {
+ display: flex;
+ width: 100%;
+ justify-content: space-between;
+}
+
+.input-box {
+ width: 100%;
+}
+
+.content-box {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 15rpx;
+}
+
+.cuIcon-cameraadd {
+ font-size: 60rpx;
+}
+
+.card-img-box {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin-right: 40rpx;
+ justify-content: space-between;
+}
+
+.card-img-box image {
+ width: 200rpx;
+ height: 200rpx;
+}
+
+.hint-txt {
+ text-align: right;
+ color: #fd9494;
+ font-size: 24rpx;
+}
+
+/* 换行 */
+.wrap-line {
+ white-space: pre-line;
+}
+
+/* 居中 */
+.wrap-center {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
\ No newline at end of file
diff --git a/packagecard/moments/publish/momentpublish.js b/packagecard/moments/publish/momentpublish.js
index 601a3fb..14342a4 100644
--- a/packagecard/moments/publish/momentpublish.js
+++ b/packagecard/moments/publish/momentpublish.js
@@ -39,6 +39,7 @@ Page({
isShowVideo: false, //是否显示视频编辑框
isShowLink: false, //是否显示链接输入框
isShowSelect: false, //是否显示选项弹框
+ isShowAudio: false, //是否显示录音弹框
curTextValue: '', //当前输入的文本内容
curLinkText: '', //当前链接输入的文本内容
isShowEdit: false, //是否显示编辑
@@ -52,21 +53,29 @@ Page({
selDirection: '1', //选中的插入方向 1.插入到下面 2.插入的上面
isInsert: false, //是否显示插入选项
topBoxHeight: 100, //顶部类型选择框的高度
+ audioFile: null, //当前的录音文件
+ audioDuration: 0, //录音文件的时长
+ isRecording: false, //是否正在录音
optionsList: [{
id: '1',
- name: '选项一'
+ name: '选项一',
+ isSel: false
}, {
id: '2',
- name: '选项二'
+ name: '选项二',
+ isSel: false
}, {
id: '3',
- name: '选项三'
+ name: '选项三',
+ isSel: false
}, {
id: '4',
- name: '选项四'
+ name: '选项四',
+ isSel: false
}, {
id: '5',
- name: '选项五'
+ name: '选项五',
+ isSel: false
}], //选项
},
@@ -133,6 +142,7 @@ Page({
_self.chooseVideo()
break
case 'audio': //音频
+ _self.checkRecordPermission()
break
case 'photo': //图片
_self.chooseImg()
@@ -141,6 +151,9 @@ Page({
_self.doChooseLocation()
break
case 'select': //选项
+ _self.setData({
+ isShowSelect: true
+ })
break
case 'link': //链接
_self.setData({
@@ -329,7 +342,8 @@ Page({
onClose() {
this.setData({
isShowInput: false,
- isShowLink: false
+ isShowLink: false,
+ isShowSelect: false
})
},
//输入框监听
@@ -502,17 +516,283 @@ Page({
}
})
},
- onHide() {
-
+ //选项选择
+ chooseTags(e) {
+ var _self = this
+ var idx = e.currentTarget.dataset.idx
+ var item = e.currentTarget.dataset.item
+ _self.data.optionsList[idx].isSel = !item.isSel
+ _self.setData({
+ optionsList: _self.data.optionsList
+ })
+ },
+ //保存选定的选项
+ doConfirmSel() {
+ var _self = this
+ var tempList = []
+ _self.data.optionsList.forEach(it => {
+ if (it.isSel) {
+ tempList.push(it)
+ }
+ })
+ var tempSel = {}
+ tempSel['type'] = 'select'
+ tempSel['valueList'] = tempList
+ _self.data.valueList.push(tempSel)
+ _self.data.optionsList.forEach(it => {
+ it.isSel = false
+ })
+ _self.setData({
+ valueList: _self.data.valueList,
+ isShowSelect: false,
+ optionsList: _self.data.optionsList
+ })
+ },
+ //确定音频
+ doConfirmAudio() {
+ var _self = this
+ var tempAudio = {}
+ tempAudio['type'] = 'audio'
+ tempAudio['value'] = _self.data.audioFile
+ _self.data.valueList.push(tempAudio)
+ _self.setData({
+ valueList: _self.data.valueList,
+ audioFile: null,
+ isShowAudio: false
+ })
+ },
+ //校验录音权限
+ checkRecordPermission() {
+ var _self = this
+ wx.getSetting({
+ success(res) {
+ if (!res.authSetting['scope.record']) {
+ wx.authorize({
+ scope: 'scope.record',
+ success() {
+ _self.setData({
+ isShowAudio: true
+ })
+ }
+ })
+ } else {
+ _self.setData({
+ isShowAudio: true
+ })
+ }
+ }
+ })
+ },
+ //开始录音
+ startRecord() {
+ var _self = this
+ //1.启动定时器用来记录时间
+ _self.data.setInter = setInterval(
+ function () {
+ var audioDuration = parseInt(_self.data.audioDuration + 1);
+ _self.setData({
+ audioDuration: parseInt(audioDuration),
+ isRecording: true
+ });
+ }, 1000)
+ //2.开始录音
+ _self.start()
+ },
+ //开始录音
+ start() {
+ console.log('开始录音')
+ const options = {
+ duration: 60000,
+ format: 'mp3', //音频格式，有效值 aac/mp3
+ }
+ //开始录音
+ recorderManager.start(options);
+ recorderManager.onStart(() => {
+ console.log('recorder start')
+ });
+ //错误回调
+ recorderManager.onError((res) => {
+ console.log(res);
+ _self.stop(false);
+ })
+ },
+ //结束录音
+ doEndRecord() {
+ var _self = this
+ clearInterval(_self.data.setInter);
+ //判断时长是否达到要求
+ recorderManager.stop();
+ recorderManager.onStop((res) => {
+ //进行录音文件上传
+ if (_self.data.audioDuration < 10) {
+ wx.showToast({
+ title: '录音时长需大于10秒',
+ icon: 'none'
+ })
+ } else {
+ //可以上传
+ // res tempFilePath 路径 duration 毫秒 fileSize 大小
+ res.isPlay = false
+ res.durationStr = _self.data.audioDuration + ''
+ res.duration = _self.data.audioDuration
+ res.totalDurationStr = '00:' + (_self.data.audioDuration > 9 ? _self.data.audioDuration : '0' + _self.data.audioDuration)
+ res.curDurationStr = '00:00'
+ res.curDuration = 0
+ res.isPlay = false
+ // _self.doUploadAudio(res)
+ _self.setData({
+ audioFile: res
+ })
+ }
+ _self.setData({
+ audioDuration: 0,
+ isRecording: false,
+ })
+ })
+ },
+ //删除录音
+ delAudio() {
+ var _self = this
+ wx.showModal({
+ title: '警告',
+ content: '确定要删除该条录音吗?',
+ success(res) {
+ if (res.confirm) {
+ _self.setData({
+ audioFile: null
+ })
+ }
+ }
+ })
},
//隐藏各类弹框
- closePop() {
+ closePop(e) {
+ var type = e.currentTarget.dataset.type
+ var _self = this
+ if (type && type == 'audio') {
+ if (_self.data.audioFile != null) {
+ wx.showModal({
+ title: '警告',
+ content: '关闭录音弹窗将清除当前录制的音频文件,确定要关闭吗?',
+ success(res) {
+ if (res.confirm) {
+ _self.setData({
+ audioFile: null,
+ isShowAudio: false
+ })
+ }
+ }
+ })
+ } else {
+ _self.setData({
+ isShowAudio: false
+ })
+ }
+ }
this.setData({
isShowPhoto: false,
isShowEdit: false,
- isShowVideo: false
+ isShowVideo: false,
+ isShowSelect: false,
})
},
+ //音频拖动
+ slider4change(e) {
+ var _self = this
+ var audio = e.currentTarget.dataset.item
+ if (audio.isPlay) {
+ innerAudioContext.seek(e.detail.value)
+ }
+ },
+ play(e) {
+ //进行播放
+ var audio = e.currentTarget.dataset.item
+ var _self = this
+ var type = e.currentTarget.dataset.type
+ var idx = e.currentTarget.dataset.idx
+ if (audio.isPlay) {
+ innerAudioContext.stop()
+ } else {
+ //找到该文件
+ innerAudioContext = wx.createInnerAudioContext()
+ // 播放音频文件
+ innerAudioContext.src = audio.tempFilePath
+ innerAudioContext.autoplay = true
+ }
+ //先需要停止其他录音文件的播放
+ innerAudioContext.onPlay(() => {
+ _self.data.audioFile.isPlay = true
+ _self.setData({
+ audioFile: _self.data.audioFile
+ })
+ });
+ innerAudioContext.onStop((res) => {
+ console.log('停止播放')
+ //重置文件的状态
+ _self.setAudioDefault()
+ })
+ innerAudioContext.onEnded((res) => {
+ console.log('播放结束')
+ //重置文件的状态
+ _self.setAudioDefault()
+ })
+ innerAudioContext.onError((res) => {
+ wx.showToast({
+ title: '播放失败',
+ icon: 'error'
+ })
+ _self.setAudioDefault()
+ })
+ innerAudioContext.onTimeUpdate(() => {
+ _self.data.audioFile.curDuration = innerAudioContext.currentTime
+ var time = Number.parseInt(_self.data.audioFile.curDuration)
+ _self.data.audioFile.curDurationStr = '00:' + (time > 9 ? time : '0' + time)
+ _self.setData({
+ audioFile: _self.data.audioFile
+ })
+ })
+ },
+ //设置录音文件恢复初始
+ setAudioDefault() {
+ var _self = this
+ //重置文件的状态
+ _self.data.audioFile.curDurationStr = '00:00'
+ _self.data.audioFile.curDuration = 0
+ _self.data.audioFile.isPlay = false
+ _self.setData({
+ audioFile: _self.data.audioFile
+ })
+ },
+ //倒退5秒
+ rewind(e) {
+ var _self = this
+ var index = e.currentTarget.dataset.index
+ var item = e.currentTarget.dataset.item
+ var idx = e.currentTarget.dataset.idx
+ var ix = e.currentTarget.dataset.i
+ if (item.isPlay) {
+ _self.data.dataList[index].list[idx].valueList[ix].curDuration = _self.data.dataList[index].list[idx].valueList[ix].curDuration - _self.data.speedStep
+ innerAudioContext.seek(_self.data.dataList[index].list[idx].valueList[ix].curDuration)
+ _self.setData({
+ dataList: _self.data.dataList
+ })
+ }
+ },
+ //快进5秒
+ speed(e) {
+ var _self = this
+ var index = e.currentTarget.dataset.index
+ var item = e.currentTarget.dataset.item
+ var idx = e.currentTarget.dataset.idx
+ var ix = e.currentTarget.dataset.i
+ if (item.isPlay) {
+ _self.data.dataList[index].list[idx].valueList[ix].curDuration = _self.data.dataList[index].list[idx].valueList[ix].curDuration + _self.data.speedStep
+ innerAudioContext.seek(_self.data.dataList[index].list[idx].valueList[ix].curDuration)
+ _self.setData({
+ dataList: _self.data.dataList
+ })
+ }
+ },
onUnload() {
chooseLocation.setLocation(null)
this.setData({
diff --git a/packagecard/moments/publish/momentpublish.wxml b/packagecard/moments/publish/momentpublish.wxml
index e79169f..dab6377 100644
--- a/packagecard/moments/publish/momentpublish.wxml
+++ b/packagecard/moments/publish/momentpublish.wxml
@@ -45,7 +45,7 @@
-
+
@@ -102,7 +102,26 @@
-
+
+
+ {{item.value.curDurationStr}}
+
+ {{item.value.totalDurationStr}}
+
+
+
+
+
+
+
+
+
+
@@ -126,8 +145,16 @@
{{item.value}}
-
-
+
+
+
+
+ {{options.name}}
+
+
+
@@ -241,24 +268,43 @@
-
-
-
- 00:{{speck_time>9 ? speck_time : '0'+ speck_time}}
- 长按录音
-
-
-
-
- {{audioFile.isPlay ? '播放中:'+speck_time+'秒' : '时长:'+audioFile.duration+'秒'}}
-
- 点击播放
- 删除
+
+
+
+
+ 00:{{audioDuration > 9 ? audioDuration : '0'+ audioDuration}}
+ 长按录音
+
+
+
+
+
+ {{audioFile.curDurationStr}}
+
+ {{audioFile.totalDurationStr}}
+
+
+
+
+
+
+
+
+
+
+
+
@@ -366,11 +412,15 @@
style="padding-bottom:180rpx;">
-
-
+
+
{{item.name}}
+
+
+
\ No newline at end of file
diff --git a/packagecard/moments/publish/momentpublish.wxss b/packagecard/moments/publish/momentpublish.wxss
index 2604550..4792557 100644
--- a/packagecard/moments/publish/momentpublish.wxss
+++ b/packagecard/moments/publish/momentpublish.wxss
@@ -215,4 +215,25 @@ van-action-sheet .noline:active {
.dir-parent-box .title {
width: 120rpx;
+}
+
+.sel-item {
+ margin: 15rpx;
+}
+
+/* 选中的条目边框 */
+.sel-border {
+ border: 1rpx solid #E6B980;
+ border-radius: 10rpx;
+ padding-bottom: 15rpx;
+}
+
+/* 语音弹框 */
+.audio-box {
+ display: flex;
+ flex-direction: row;
+ width: 100%;
+ justify-content: center;
+ align-items: center;
+ min-height: 400rpx;
}
\ No newline at end of file
diff --git a/packagecard/purse/takecash.js b/packagecard/purse/takecash.js
index 4feb52b..583b2be 100644
--- a/packagecard/purse/takecash.js
+++ b/packagecard/purse/takecash.js
@@ -61,6 +61,13 @@ Page({
})
return
}
+ if (_self.data.takeValue < 1) {
+ wx.showToast({
+ title: '最低提现1元',
+ icon: 'error'
+ })
+ return
+ }
if (_self.data.takeValue > (_self.data.accountInfo.accountMoney / 100)) {
wx.showToast({
title: '超过零钱余额',
diff --git a/packagecard/purse/takecash.wxml b/packagecard/purse/takecash.wxml
index e8b9bba..969057e 100644
--- a/packagecard/purse/takecash.wxml
+++ b/packagecard/purse/takecash.wxml
@@ -15,12 +15,13 @@
提现金额
- ¥
+ ¥
全部提现
-
+
- 加载中...
+
+
+