配置升级

WebContent/mobile/cutProductDetail.jsp

@@ -207,7 +207,7 @@
 			</ul>
 		</div>
 		<div class="mui-table-view no-bg no-line footer">
-            我也要制作 发布减价活动 <span class="main-color">上饶网</span>
+            我也要制作 发布减价活动
         </div>
 	</div>
     <div id="share" style="display: none;">

WebContent/static/mobile/frame/mui/js/city.data-3.js

@@ -4711,7 +4711,7 @@ var cityData = [{
 			text: "信州区"
 		}, {
 			value: "361121",
-			text: "上饶县"
+			text: "广信区"
 		}, {
 			value: "361122",
 			text: "广丰县"

WebContent/static/mobile/js/cutProductDetail.js

@@ -41,8 +41,8 @@ mui.ready(function(){
 	});
     $(".footer").on("tap",function(e){
         var html=[];
-        html.push('<img src="'+base+'/static/mobile/image/kefu.png" style="width:100%">' +
-            '<a class="fs16" href="tel:18797831026">电话：18797831026</a>');
+        html.push('<img src="'+imgUrl+custom.custom_qrcode+'" style="width:100%">' +
+            '<a class="fs16" href="tel:'+custom.custom_mobile+'">电话：'+custom.custom_mobile+'</a>');
         mui.alert(html.join(""), '长按二维码联系客服');
     });
 	$(".merchant").on("tap",function(){

WebContent/static/web/frame/jquery-selector/area-data.js

@@ -3654,7 +3654,7 @@ postCodeJson = {
 	"361100" : [ {
 		"361102" : "信州区"
 	}, {
-		"361121" : "上饶县"
+		"361121" : "广信区"
 	}, {
 		"361122" : "广丰县"
 	}, {

WebContent/web/merchant/merchantForm.jsp

@@ -79,7 +79,7 @@
 				        <option value="">请选择</option>
 						<option value="铅山县">铅山县</option>
 				        <option value="信州区">信州区</option>
-				        <option value="上饶县">上饶县</option>
+				        <option value="广信区">广信区</option>
 				        <option value="广丰区">广丰区</option>
 			        </select>
 				</div>

src/com/mall/controller/act/ActInfoController.java

@@ -406,7 +406,7 @@ public class ActInfoController extends BaseController{
                     userCoupon.set("openid",openid);
                     userCoupon.set("coupon_name",actPrize.getStr("prize_name"));
                     if("10".equals(actInfo.getStr("act_type"))){
-                        userCoupon.set("merchant_name","上饶网");
+                        userCoupon.set("merchant_name",PropKit.get("siteName"));
                     }else{
                         userCoupon.set("merchant_id",actInfo.getInt("merchant_id"));
                         userCoupon.set("merchant_name",actInfo.getStr("merchant_name"));