From 3f84387047342f97e01048694a10e31e8777f973 Mon Sep 17 00:00:00 2001 From: liuxiaoyan <lxy@bronet.cn> Date: Thu, 10 Jan 2019 10:57:52 +0800 Subject: [PATCH] Merge branch 'master' of http://114.215.101.231:8099/root/jyht into liuxiaoyan # Conflicts: # public/themes/simpleboot3/user/index/inquiry.html --- public/themes/simpleboot3/portal/inquiry/index.html | 1 + public/themes/simpleboot3/user/index/inquiry.html | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/public/themes/simpleboot3/portal/inquiry/index.html b/public/themes/simpleboot3/portal/inquiry/index.html index 0ee295f..310e6f1 100644 --- a/public/themes/simpleboot3/portal/inquiry/index.html +++ b/public/themes/simpleboot3/portal/inquiry/index.html @@ -570,6 +570,7 @@ $('.stop').hide() $('.stopping').hide() $('.start').show() + $('.next_step').hide() }) //上传图片 diff --git a/public/themes/simpleboot3/user/index/inquiry.html b/public/themes/simpleboot3/user/index/inquiry.html index b407abf..f3a3720 100644 --- a/public/themes/simpleboot3/user/index/inquiry.html +++ b/public/themes/simpleboot3/user/index/inquiry.html @@ -582,14 +582,14 @@ //列表中点击试听 - $('.voice_third').click( - function () { - var tryId=$(this).attr('try-id'); - wx.playVoice({ - localId:tryId - }); - } - ) + // $('.voice_third').click( + // function () { + // var tryId=$(this).attr('try-id'); + // wx.playVoice({ + // localId:tryId + // }); + // } + // ) //我要发送 $('.submit_voice').click(function () { -- libgit2 0.24.0