diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html index bcd176c63..1f10d8511 100755 --- a/application/index/view/default/goods/index.html +++ b/application/index/view/default/goods/index.html @@ -434,7 +434,7 @@ {{/if}} -
';
- print_r($res);
- print_r($params);die;
+ if(empty($params['terminal']))
+ {
+ return DataReturn('未指定小程序终端类型', -1);
+ }
+ $params['application_name'] = $params['terminal'];
+ $ret = AppMiniService::ThemeUploadHandle($res['url'], $params);
break;
// 默认
diff --git a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
index e644fb65e..64fd5d4d5 100755
--- a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
+++ b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
@@ -14,25 +14,41 @@ var dialog = dialog || {};
dialog.alert = function(options) {
options = options || {};
+ options.class_name = options.class_name || '';
options.title = options.title || null;
options.content = options.content || '提示内容';
+ options.isClose = options.isClose || false;
+ options.isBtn = options.isBtn || false;
+ options.config = options.config || {};
options.onConfirm = options.onConfirm || function() {
};
var html = [];
- html.push('');
+ html.push('');
html.push('');
- if(options.title !== null)
+ if(options.title !== null || options.isClose === true)
{
- html.push('' + options.title + '');
+ html.push('');
+ if(options.title !== null)
+ {
+ html.push(''+options.title+'');
+ }
+ if(options.isClose === true)
+ {
+ html.push('×');
+ }
+ html.push('');
}
html.push('' + options.content + '');
- html.push('确定');
+ if(options.isBtn)
+ {
+ html.push('确定');
+ }
html.push('');
html.push('');
return $(html.join(''))
.appendTo('body')
- .modal()
+ .modal(options.config)
.on('closed.modal.amui', function() {
options.onConfirm();
var $this = $(this);
diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css
index 5d6b44241..2fb4399fe 100755
--- a/public/static/index/default/css/goods.css
+++ b/public/static/index/default/css/goods.css
@@ -306,6 +306,10 @@ flex: 1 1 0%;line-height: 16px;cursor: pointer;}
padding-left: 65px;
margin-top: 10px !important;
}
+ .buy-nav-not-many-spec {
+ padding-left: 0px !important;
+ margin-top: 20px !important;
+ }
}
@media only screen and (max-width:641px) {
.buy-nav .buy-submit-container,