zhangdongming преди 2 години
родител
ревизия
d810d597a5
променени са 4 файла, в които са добавени 4 реда и са изтрити 1 реда
  1. 1 0
      Ansjer/cn_config/config_formal.py
  2. 1 0
      Ansjer/cn_config/config_test.py
  3. 1 0
      Ansjer/us_config/config_formal.py
  4. 1 1
      Controller/UnicomCombo/UnicomComboController.py

+ 1 - 0
Ansjer/cn_config/config_formal.py

@@ -20,6 +20,7 @@ PUSH_BUCKET = 'push'                                # 推送存储桶
 PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
 PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
 AVATAR_BUCKET = 'avatar-cn'                         # 头像存储桶
 AVATAR_BUCKET = 'avatar-cn'                         # 头像存储桶
 LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
 LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
+PUSH_CLOUD_PHOTO = 'push-cloud-photo'               # 推送云相册存储桶
 
 
 # redis节点
 # redis节点
 SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
 SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'

+ 1 - 0
Ansjer/cn_config/config_test.py

@@ -20,6 +20,7 @@ PUSH_BUCKET = 'push'                                # 推送存储桶
 PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
 PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
 AVATAR_BUCKET = 'avatar-cn'                         # 头像存储桶
 AVATAR_BUCKET = 'avatar-cn'                         # 头像存储桶
 LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
 LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
+PUSH_CLOUD_PHOTO = 'push-cloud-photo'               # 推送云相册存储桶
 
 
 # redis节点
 # redis节点
 SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
 SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'

+ 1 - 0
Ansjer/us_config/config_formal.py

@@ -20,6 +20,7 @@ PUSH_BUCKET = 'foreignpush'                         # 推送存储桶
 PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
 PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
 AVATAR_BUCKET = 'avatar-us'                         # 头像存储桶
 AVATAR_BUCKET = 'avatar-us'                         # 头像存储桶
 LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
 LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
+PUSH_CLOUD_PHOTO = 'push-cloud-photo'               # 推送云相册存储桶
 
 
 # redis节点
 # redis节点
 SERVER_HOST = 'backendserver.5tgle2.0001.usw1.cache.amazonaws.com'
 SERVER_HOST = 'backendserver.5tgle2.0001.usw1.cache.amazonaws.com'

+ 1 - 1
Controller/UnicomCombo/UnicomComboController.py

@@ -457,7 +457,7 @@ class UnicomComboView(View):
                     'expirationDays': item['expiration_days'],
                     'expirationDays': item['expiration_days'],
                     'expirationType': item['expiration_type'],
                     'expirationType': item['expiration_type'],
                     'price': item['price'],
                     'price': item['price'],
-                    'virtualPrice': item['virtual_price'],
+                    'virtualPrice': item['virtual_price'] if item['virtual_price'] else '',
                     'remark': item['remark'],
                     'remark': item['remark'],
                     'payTypes': list(pay_type_qs),
                     'payTypes': list(pay_type_qs),
                 })
                 })